manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持内页主色调跟随主框架调色一起调整。

Browse Source
This commit is contained in:
thinkgem
2019-07-09 15:15:58 +08:00
parent 930422c06e
commit a75b33e195
15 changed files with 105 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/resources/static/adminlte/css/skins/skin-black-light.css
View File

@@ -75,7 +75,6 @@
background: transparent;
box-shadow: none;
}
.wrapper,
.sidebar,
.left-side {
background-color: #eaedf1;
@@ -168,4 +167,4 @@
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

3
common/src/main/resources/static/adminlte/css/skins/skin-black.css
View File

@@ -76,7 +76,6 @@
background: transparent;
box-shadow: none;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;
@@ -157,4 +156,4 @@
border-left-color: #222;
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#ddd;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#ddd;}

3
common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #E3E7EC;
@@ -160,4 +159,4 @@
background-color: #3b8ab8;
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

3
common/src/main/resources/static/adminlte/css/skins/skin-blue.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;
@@ -138,4 +137,4 @@
background-color: #3b8ab8;
}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#3c8dbc;}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#3c8dbc;}

14
common/src/main/resources/static/adminlte/css/skins/skin-green-light.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #eaedf1;
@@ -149,4 +148,15 @@
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
a, a:hover, a:active, a:focus, .form-unit {color:#00a65a;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#00a65a!important;border-color:#00a65a;}

12
common/src/main/resources/static/adminlte/css/skins/skin-green.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;
@@ -131,3 +130,14 @@
}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#00a65a;}
a, a:hover, a:active, a:focus, .form-unit {color:#00a65a;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#00a65a!important;border-color:#00a65a;}

14
common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #eaedf1;
@@ -149,4 +148,15 @@
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
a, a:hover, a:active, a:focus, .form-unit {color:#605ca8;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#605ca8!important;border-color:#605ca8;}

12
common/src/main/resources/static/adminlte/css/skins/skin-purple.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;
@@ -131,3 +130,14 @@
}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#605ca8;}
a, a:hover, a:active, a:focus, .form-unit {color:#605ca8;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#605ca8!important;border-color:#605ca8;}

14
common/src/main/resources/static/adminlte/css/skins/skin-red-light.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #eaedf1;
@@ -149,4 +148,15 @@
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
a, a:hover, a:active, a:focus, .form-unit {color:#dd4b39;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#dd4b39!important;border-color:#dd4b39;}

14
common/src/main/resources/static/adminlte/css/skins/skin-red.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;
@@ -130,4 +129,15 @@
border-bottom-left-radius: 0;
}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#dd4b39;}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#dd4b39;}
a, a:hover, a:active, a:focus, .form-unit {color:#dd4b39;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#dd4b39!important;border-color:#dd4b39;}

14
common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #eaedf1;
@@ -149,4 +148,15 @@
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}
a, a:hover, a:active, a:focus, .form-unit {color:#f39c12;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#f39c12!important;border-color:#f39c12;}

14
common/src/main/resources/static/adminlte/css/skins/skin-yellow.css
View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;
@@ -130,4 +129,15 @@
border-bottom-left-radius: 0;
}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#f39c12;}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#f39c12;}
a, a:hover, a:active, a:focus, .form-unit {color:#f39c12;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected]
{background-color:#f39c12!important;border-color:#f39c12;}

4
modules/core/src/main/resources/views/modules/sys/sysDesktop.html
View File

File diff suppressed because one or more lines are too long

8
modules/core/src/main/resources/views/themes/default/include/header.html
View File

@@ -1,2 +1,6 @@
<% include('/include/csslibs.html', {libs: libs!}){} %>
<link rel="stylesheet" href="${ctxStatic}/common/common.css?${_version}">
<% include('/include/csslibs.html', {libs: libs!}){}
// 获取当前皮肤样式名称：详见jeesite-common项目下的static/adminlte/css/skins目录
var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light');
var skinName = cookie('skinName_'+session.userCode, false, defaultSkinName); %>
<link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/common/common.css?${_version}">

5
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html
View File

@@ -1,8 +1,4 @@
<%
// 默认皮肤样式名称：详见jeesite-common项目下的static/adminlte/css/skins目录
var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light');
// 从cookie里获取样式名，取不到使用默认样式
var skinName = cookie('skinName_'+user.userCode, false, defaultSkinName);
// 侧边栏的默认显示样式：1：默认显示侧边栏；2：默认折叠侧边栏
var sidebarStyle = @Global.getConfig('sys.index.sidebarStyle', '1');
var sidebarCollapse = (sidebarStyle == '2' ? 'sidebar-collapse' : '');
@@ -11,7 +7,6 @@ var bodyClass = 'fixed noscroll2 sidebar-mini ' + sidebarCollapse;
<% layout('/layouts/default.html', {title: '', bodyClass: bodyClass, libs: ['tabPage']}){ %>
<% include('/include/upgrade.html'){} // 如果客户浏览器版本过低，则显示浏览器升级提示。 %>
<link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/modules/sys/sysIndex.css?${_version}">
<header class="main-header">
<% include('sysIndex/topMenu.html'){} %>