From 958d019cd54506a48d260bcec0ec2998f4fd48cc Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 16 Feb 2022 15:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E4=BC=98=E5=8C=96=E6=94=B9?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adminlte/css/skins/skin-black-light2.css | 3 +- .../adminlte/css/skins/skin-blue-light.css | 3 +- .../adminlte/css/skins/skin-blue-light2.css | 39 +++----- .../adminlte/css/skins/skin-blue-light3.css | 85 ++++++++--------- .../static/adminlte/css/skins/skin-blue2.css | 39 +++----- .../static/adminlte/css/skins/skin-blue3.css | 92 ++++++++----------- .../i18n/core/sys/i18n_en.properties | 8 +- .../main/resources/views/include/head.html | 11 +-- .../views/modules/sys/switchSkin.html | 12 +-- .../views/modules/sys/sysDesktop.html | 2 +- .../views/modules/demo/demoFormTabPage.html | 16 ++-- 11 files changed, 129 insertions(+), 181 deletions(-) diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-black-light2.css b/common/src/main/resources/static/adminlte/css/skins/skin-black-light2.css index 0d757ad0..542ec8fe 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-black-light2.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-black-light2.css @@ -145,7 +145,8 @@ border-bottom-left-radius: 0; } .main-footer { - border-top-color: #d2d6de; + border-top-color: #e5e5e5; + border-radius: 4px; } .skin-blue.layout-top-nav .main-header > .logo { background-color: #2A579A; 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 7ecd3bfe..e68720e4 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 @@ -144,7 +144,8 @@ border-bottom-left-radius: 0; } .main-footer { - border-top-color: #d2d6de; + border-top-color: #e5e5e5; + border-radius: 4px; } .skin-blue.layout-top-nav .main-header > .logo { background-color: #2A579A; 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 index 6eca6ec2..feb048d5 100644 --- 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 @@ -150,7 +150,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor border-bottom-left-radius: 0; } .main-footer { - border-top-color: #d2d6de; + border-top-color: #e5e5e5; + border-radius: 4px; } .skin-blue.layout-top-nav .main-header > .logo { background-color: #1890ff; @@ -167,6 +168,17 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .content-wrapper, .right-side, body {background-color:#f0f2f5;} +/* 页签-经典风格 */ +.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;} +.tabpanel_mover li.active {background-color:#3aa0ff;box-shadow:0 0 5px #e6e6e6;} +.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;} + .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, @@ -179,31 +191,6 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;} .form-unit {border-bottom: 1px solid #eee;} -.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;} -.tabpanel_mover li.active {background-color:#3aa0ff;box-shadow:0 0 5px #e6e6e6;} -.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;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css index a5ab78e3..428699c7 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css @@ -150,7 +150,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor border-bottom-left-radius: 0; } .main-footer { - border-top-color: #d2d6de; + border-top-color: #e5e5e5; + border-radius: 4px; } .skin-blue.layout-top-nav .main-header > .logo { background-color: #1890ff; @@ -165,6 +166,41 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .sidebar-menu li>a>.pull-right-container {left:0;} .sidebar-menu .treeview-item.active > a {color:#1890ff;background-color:#e7f4ff;border-right:0;border-radius:6px;} +/* 页签添加内边距 */ +.content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#f0f2f5;} +.box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;} +.tabpanel_content .html_content {padding:14px 14px 13px 15px;} +.tabpanel_tab_content {border-bottom:0;} +.ui-layout-resizer {background:none;} +.content {padding:0!important} + +/* 页签-无界风格 */ +.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#fff;} +.tabpanel_mover li .title {padding-left:0;text-align:center;} +.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:4px;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:transparent;border-bottom-color:#eeeeee;overflow:visible;} +.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:12px;} +.tabpanel_tab_content .tabpanel_mover {margin:0 5px;} + +/* 页签-下划线风格 +.tabpanel_mover li {background:#fff;border:0;padding:5px 16px 5px 3px;} +.tabpanel_mover li .title {padding-left:0;text-align:center;} +.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #3aa0ff;} +.tabpanel_mover li.active div {color:#0975d9;} +.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;} +.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 {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;} +.tabpanel_tab_content .tabpanel_move_content {min-height:32px;} +.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */ + .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, @@ -192,50 +228,3 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .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:#ecf9ff;} /* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */ - - /* 内容页面，内边距风格 */ -.content-wrapper, .right-side, body, iframe {background-color:#f0f2f5;} -.ui-layout-container, .main-content {padding:15px 15px 13px 15px;} -.ui-layout-resizer {background:transparent;} -.ui-layout-pane>.main-content {padding:0;} -.ui-layout-content>.wrapper>.main-content {padding:0;} -.box-main,.nav-main,.ui-layout-pane{border-radius:5px;} - -/* 页签-无界风格 */ -.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#fff;} -.tabpanel_mover li .title {padding-left:0;text-align:center;} -.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:4px;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:transparent;border-bottom-color:#eeeeee;overflow:visible;} -.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:10px;} -.tabpanel_tab_content .tabpanel_mover {margin:0 5px;} -.tabpanel_content .html_content {margin-top:-1px;} - -/* 页签-经典风格 -.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;} -.tabpanel_mover li.active {background-color:#3aa0ff;box-shadow:0 0 5px #e6e6e6;} -.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:0;padding:5px 16px 5px 3px;} -.tabpanel_mover li .title {padding-left:0;text-align:center;} -.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #3aa0ff;} -.tabpanel_mover li.active div {color:#0975d9;} -.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;} -.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 {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;} -.tabpanel_tab_content .tabpanel_move_content {min-height:32px;} -.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */ diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css index f692ea2b..3bb3050a 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css @@ -150,7 +150,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor border-bottom-left-radius: 0; } .main-footer { - border-top-color: #d2d6de; + border-top-color: #e5e5e5; + border-radius: 4px; } .skin-blue.layout-top-nav .main-header > .logo { background-color: #1e5edb; @@ -167,6 +168,17 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .content-wrapper, .right-side, body {background-color:#f0f2f5;} +/* 页签-经典风格 */ +.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;} +.tabpanel_mover li.active {background-color:#1e5edb;box-shadow:0 0 5px #e6e6e6;} +.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;} + .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, @@ -179,31 +191,6 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;} .form-unit {border-bottom: 1px solid #eee;} -.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;} -.tabpanel_mover li.active {background-color:#1e5edb;box-shadow:0 0 5px #e6e6e6;} -.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 #1e5edb;} -.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:#1e5edb;} .nav-tabs-custom>.nav-tabs>li.active {border-top-color:#1e5edb;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css index aa27e37b..7bd0a978 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css @@ -150,7 +150,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor border-bottom-left-radius: 0; } .main-footer { - border-top-color: #d2d6de; + border-top-color: #e5e5e5; + border-radius: 4px; } .skin-blue.layout-top-nav .main-header > .logo { background-color: #1e5edb; @@ -165,6 +166,41 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .sidebar-menu li>a>.pull-right-container {left:0;} .sidebar-menu .treeview-item.active > a {color:#2a50ec;background-color:#edf2fc;border-right:0;border-radius:6px;} +/* 页签添加内边距 */ +.content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#f0f2f5;} +.box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;} +.tabpanel_content .html_content {padding:14px 14px 13px 15px;} +.tabpanel_tab_content {border-bottom:0;} +.ui-layout-resizer {background:none;} +.content {padding:0!important} + +/* 页签-无界风格 */ +.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#fff;} +.tabpanel_mover li .title {padding-left:0;text-align:center;} +.tabpanel_mover li.active {background-color:#316ee6;} +.tabpanel_mover li.active div {color:#fff;} +.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;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:transparent;border-bottom-color:#eeeeee;overflow:visible;} +.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:12px;} +.tabpanel_tab_content .tabpanel_mover {margin:0 5px;} + +/* 页签-下划线风格 +.tabpanel_mover li {background:#fff;border:0;padding:5px 16px 5px 3px;} +.tabpanel_mover li .title {padding-left:0;text-align:center;} +.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #1e5edb;} +.tabpanel_mover li.active div {color:#0975d9;} +.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;} +.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 {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;} +.tabpanel_tab_content .tabpanel_move_content {min-height:32px;} +.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */ + .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, @@ -177,13 +213,6 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;} .form-unit {border-bottom: 1px solid #eee;} -/* .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:#1e5edb;} .nav-tabs-custom>.nav-tabs>li.active {border-top-color:#1e5edb;} @@ -199,50 +228,3 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .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:#f0f5ff;} /* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */ - -/* 内容页面，内边距风格 */ -.content-wrapper, .right-side, body, iframe {background-color:#f0f2f5;} -.ui-layout-container, .main-content {padding:15px 15px 13px 15px;} -.ui-layout-resizer {background:transparent;} -.ui-layout-pane>.main-content {padding:0;} -.ui-layout-content>.wrapper>.main-content {padding:0;} -.box-main,.nav-main,.ui-layout-pane{border-radius:5px;} - -/* 页签-无界风格 */ -.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#fff;} -.tabpanel_mover li .title {padding-left:0;text-align:center;} -.tabpanel_mover li.active {background-color:#316ee6;} -.tabpanel_mover li.active div {color:#fff;} -.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;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:transparent;border-bottom-color:#eeeeee;overflow:visible;} -.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:10px;} -.tabpanel_tab_content .tabpanel_mover {margin:0 5px;} -.tabpanel_content .html_content {margin-top:-1px;} - -/* 页签-经典风格 -.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;} -.tabpanel_mover li.active {background-color:#1e5edb;box-shadow:0 0 5px #e6e6e6;} -.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:0;padding:5px 16px 5px 3px;} -.tabpanel_mover li .title {padding-left:0;text-align:center;} -.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #1e5edb;} -.tabpanel_mover li.active div {color:#0975d9;} -.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;} -.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 {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;} -.tabpanel_tab_content .tabpanel_move_content {min-height:32px;} -.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */ diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties index b4ed06b1..f41c1390 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties @@ -118,10 +118,10 @@ 绿灰=Green Grey 红灰=Red Grey 黄灰=Yellow Grey -亮蓝(经典)=Bright Blue -浅蓝(经典)=Light Blue -亮蓝(无界)=Bright Blue2 -浅蓝(无界)=Light Blue2 +亮蓝-经典=Bright Blue +浅蓝-经典=Light Blue +亮蓝-无界=Bright Blue2 +浅蓝-无界=Light Blue2 表单弹窗模式=Form popup mode 取消页签模式=Cancel tab mode diff --git a/modules/core/src/main/resources/views/include/head.html b/modules/core/src/main/resources/views/include/head.html index fe8d93fa..7b2f8f6e 100644 --- a/modules/core/src/main/resources/views/include/head.html +++ b/modules/core/src/main/resources/views/include/head.html @@ -10,11 +10,8 @@ -<% if(parameter.__layer! == 'true'){ %> - -<% if(parameter.__layer_title! == 'false'){ %> - +<% if(parameter.__layer! == 'true'){ if(parameter.__layer_title! == 'false'){ %> + <% }else{ %> - -<% } -} %> + +<% } } %> diff --git a/modules/core/src/main/resources/views/modules/sys/switchSkin.html b/modules/core/src/main/resources/views/modules/sys/switchSkin.html index d792740c..9618ac8b 100644 --- a/modules/core/src/main/resources/views/modules/sys/switchSkin.html +++ b/modules/core/src/main/resources/views/modules/sys/switchSkin.html @@ -1,8 +1,8 @@ <% layout('/layouts/default.html', {title:'切换主题'}){ %>