From a75b33e19540042e1e97e2e6f44595fbd30ebbc4 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 9 Jul 2019 15:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=86=85=E9=A1=B5=E4=B8=BB?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E8=B7=9F=E9=9A=8F=E4=B8=BB=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E8=B0=83=E8=89=B2=E4=B8=80=E8=B5=B7=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/adminlte/css/skins/skin-black-light.css | 3 +-- .../static/adminlte/css/skins/skin-black.css | 3 +-- .../static/adminlte/css/skins/skin-blue-light.css | 3 +-- .../static/adminlte/css/skins/skin-blue.css | 3 +-- .../static/adminlte/css/skins/skin-green-light.css | 14 ++++++++++++-- .../static/adminlte/css/skins/skin-green.css | 12 +++++++++++- .../adminlte/css/skins/skin-purple-light.css | 14 ++++++++++++-- .../static/adminlte/css/skins/skin-purple.css | 12 +++++++++++- .../static/adminlte/css/skins/skin-red-light.css | 14 ++++++++++++-- .../static/adminlte/css/skins/skin-red.css | 14 ++++++++++++-- .../adminlte/css/skins/skin-yellow-light.css | 14 ++++++++++++-- .../static/adminlte/css/skins/skin-yellow.css | 14 ++++++++++++-- .../resources/views/modules/sys/sysDesktop.html | 4 +--- .../views/themes/default/include/header.html | 8 ++++++-- .../views/themes/default/modules/sys/sysIndex.html | 5 ----- 15 files changed, 105 insertions(+), 32 deletions(-) diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-black-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-black-light.css index f10e6199..82ca9fce 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-black-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-black-light.css @@ -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;} \ No newline at end of file +.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-black.css b/common/src/main/resources/static/adminlte/css/skins/skin-black.css index 7fd0e780..fd144e6a 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-black.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-black.css @@ -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;} \ No newline at end of file +.sidebar-menu .treeview-item.active > a {color:#000;background-color:#ddd;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css index 48bcf794..446cba14 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css @@ -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;} \ No newline at end of file +.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue.css index f8ba3e09..ceeab3cf 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-blue.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue.css @@ -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;} \ No newline at end of file +.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#3c8dbc;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css index d44a3f42..511f53c1 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css @@ -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;} \ No newline at end of file +.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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-green.css b/common/src/main/resources/static/adminlte/css/skins/skin-green.css index 8c847760..e41d0562 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-green.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-green.css @@ -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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css index a76bcbf3..21e33f42 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css @@ -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;} \ No newline at end of file +.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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-purple.css b/common/src/main/resources/static/adminlte/css/skins/skin-purple.css index 6d6f28a7..212d5e95 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-purple.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-purple.css @@ -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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css index e475d34e..0b80b3ad 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css @@ -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;} \ No newline at end of file +.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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-red.css b/common/src/main/resources/static/adminlte/css/skins/skin-red.css index 8b46edd2..a628d35f 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-red.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-red.css @@ -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;} \ No newline at end of file +.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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css index 2a511a09..e1709b5a 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css @@ -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;} \ No newline at end of file +.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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css b/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css index 08a2e020..8cd98625 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css @@ -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;} \ No newline at end of file +.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;} diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html index 329344a9..b4e7038d 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html +++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html @@ -479,9 +479,7 @@ -

- Visitors -

+

访问

+
−
diff --git a/modules/core/src/main/resources/views/themes/default/include/header.html b/modules/core/src/main/resources/views/themes/default/include/header.html index 07f86994..d3a52039 100644 --- a/modules/core/src/main/resources/views/themes/default/include/header.html +++ b/modules/core/src/main/resources/views/themes/default/include/header.html @@ -1,2 +1,6 @@ -<% include('/include/csslibs.html', {libs: libs!}){} %> - +<% 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); %> + + \ No newline at end of file diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html index e59cf0cd..41a1e28c 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html @@ -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'){} // 如果客户浏览器版本过低，则显示浏览器升级提示。 %> -
<% include('sysIndex/topMenu.html'){} %>