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..be2b7d5a 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; diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css new file mode 100644 index 00000000..5fbfae00 --- /dev/null +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css @@ -0,0 +1,214 @@ +/* + * http://jeesite.com + */ +a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable { + color:#1890ff; +} +.main-header .navbar { + background-color: #1890ff; +} +.main-header .navbar .nav > li > a { + color: #ffffff; +} +.main-header .navbar .nav > li > a:hover, +.main-header .navbar .nav > li > a:active, +.main-header .navbar .nav > li > a:focus, +.main-header .navbar .nav .open > a, +.main-header .navbar .nav .open > a:hover, +.main-header .navbar .nav .open > a:focus, +.main-header .navbar .nav > .active > a { + background: rgba(0, 0, 0, 0.1); + color: #f6f6f6; +} +.main-header .navbar .sidebar-toggle { + color: #ffffff; +} +.main-header .navbar .sidebar-toggle:hover { + color: #f6f6f6; + background: rgba(0, 0, 0, 0.1); +} +.main-header .navbar .sidebar-toggle { + color: #fff; +} +.main-header .navbar .sidebar-toggle:hover { + background-color: #367fa9; +} +@media (max-width: 767px) { + .main-header .navbar .dropdown-menu li.divider { + background-color: rgba(255, 255, 255, 0.1); + } + .main-header .navbar .dropdown-menu li a { + color: #fff; + } + .main-header .navbar .dropdown-menu li a:hover { + background: #367fa9; + } +} +.main-header .logo { + background-color: #1890ff; + color: #ffffff; + border-bottom: 0 solid transparent; +} +.main-header .logo:hover { + background-color: #1890ff; +} +.main-header li.user-header { + background-color: #1890ff; +} +.content-header { + background: transparent; +} +.sidebar, +.left-side { + background-color: #ffffff; +} +.content-wrapper, +.main-footer { + border-left: 1px solid #eeeeee; +} +.user-panel > .info, +.user-panel > .info > a { + color: #555; +} +.sidebar-menu > li { + -webkit-transition: border-left-color 0.3s ease; + -o-transition: border-left-color 0.3s ease; + transition: border-left-color 0.3s ease; +} +.sidebar-menu > li.header { + color: #848484; + background: #f8f8f8; +} +.sidebar-menu > li > a { + border-left: 3px solid transparent; + font-weight: 600; +} +.sidebar-menu > li:hover > a, +.sidebar-menu > li.active > a { + color: #000; + background: #ffffff; +} +.sidebar-menu > li.active { + border-left-color: #1890ff; +} +.sidebar-menu > li.active > a { + font-weight: 600; +} +.sidebar-menu > li.menu-open > a, +.sidebar-menu > li > .treeview-menu { + background: #ffffff; +} +.sidebar a { + color: #555; +} +.sidebar a:hover { + text-decoration: none; +} +.treeview-menu > li > a { + color: #555; +} +.treeview-menu > li.active > a, +.treeview-menu > li > a:hover { + color: #000; +} +.sidebar-form { + border-radius: 3px; + border: 1px solid #d2d6de; + margin: 10px 10px; +} +.sidebar-form input[type="text"], +.sidebar-form .btn { + box-shadow: none; + background-color: #fff; + border: 1px solid transparent; + height: 35px; +} +.sidebar-form input[type="text"] { + color: #666; + border-top-left-radius: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 2px; +} +.sidebar-form input[type="text"]:focus, +.sidebar-form input[type="text"]:focus + .input-group-btn .btn { + background-color: #fff; + color: #666; +} +.sidebar-form input[type="text"]:focus + .input-group-btn .btn { + border-left-color: #fff; +} +.sidebar-form .btn { + color: #999; + border-top-left-radius: 0; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 0; +} +.main-footer { + border-top-color: #d2d6de; +} +.skin-blue.layout-top-nav .main-header > .logo { + background-color: #1890ff; + color: #ffffff; + border-bottom: 0 solid transparent; +} +.skin-blue.layout-top-nav .main-header > .logo:hover { + background-color: #3b8ab8; +} + +.sidebar-menu .treeview-item.active > a {color:#1890ff;background-color:#e1f1ff;border-right:solid #57a6ee;} + +.content-wrapper, .right-side, body {background-color:#f8f8f8;} + +.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], +.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff;} +.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;} +.form-unit {border-bottom: 1px solid #eee;} + +.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4; + border-radius:3px;background:#fff;box-shadow:0 0 5px #e6e6e6;} +.tabpanel_mover li.active {background-color:#3aa0ff;} +.tabpanel_mover li.active div {color:#fff;} +.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;} +.tabpanel_mover li .closer:before {content:"\f00d";} +.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2); + -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;} +.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;} +.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;} +/* .tabpanel_mover li {background:#fff;border-right:1px solid #eee;padding:8px 16px 8px 5px;} +.tabpanel_mover li.active {background-color:#fff;border-bottom:3px solid #3aa0ff;} +.tabpanel_mover li.active div {color:#0975d9;} +.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.7;} +.tabpanel_mover li .closer:before {content:"\f00d";} +.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2); + -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;} +.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;} 替换上面 tab 样式，改变 tab 风格。*/ + +/* .main-content {padding:10px;} +.ui-layout-container {padding:10px;} +.ui-layout-resizer {background:transparent;} +.ui-layout-pane {box-shadow:0 0 5px #e0e0e0;} +.ui-layout-pane>.main-content {padding:0;} +.ui-layout-content>.wrapper>.main-content {padding:0;} +.box-main,.nav-main{border-radius:3px;box-shadow:0 0 5px #e0e0e0;} 解开注释，可给内容页面，添加内边距样式 */ +.box-main>.box-header {border-bottom-color:#eeeeee;} +.box-main>.box-header .box-title .fa {color:#1890ff;} +.nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;} +.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple, +.select2-container--default .select2-search--dropdown .select2-search__field {border-color:#66afe9!important;} +.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;} +.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column, +.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid .ui-widget-content, .ui-jqgrid tr.ui-row-ltr td, +.ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;} +.ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td, +.ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;} +.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#e5f3ff;} +/* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */ 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 9976b9d7..c95cd375 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; 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 04efe0f1..172b1af5 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; 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 49ddf670..7eb50d12 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; 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 10d91c52..6e251035 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; 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 212e24b1..8ad1920f 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; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 37f3a702..b90ae405 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html b/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html index 959dd031..ad78152b 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html +++ b/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html @@ -1,153 +1,145 @@ -<% layout('/layouts/default.html', {title: '切换主题风格'}){ %> +<% layout('/layouts/default.html', {title:'切换主题风格'}){ %> + <% } %> 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 750adfe3..7beee0c9 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'){} %> diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html index 104b8ad7..1f6e7654 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html @@ -40,10 +40,10 @@
  + class="form-control" data-style="minimal-grey"> ${text('记住账号')}   + class="form-control" data-style="minimal-grey"> ${text('记住密码')}