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 428699c7..f97d1160 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 @@ -164,7 +164,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .sidebar-menu {padding:0 8px 0 7px;} .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;} +.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;} @@ -209,9 +209,9 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .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;} +.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff!important;} .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;} -.form-unit {border-bottom: 1px solid #eee;} +.form-unit {border-bottom:1px solid #eee;} .box-main>.box-header {border-bottom-color:#eeeeee;} .box-main>.box-header .box-title .fa {color:#1890ff;} @@ -220,10 +220,10 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .select2-container--default .select2-search--dropdown .select2-search__field, .select2-container--default.select2-container--focus .select2-selection--single, .select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#40a9ff!important;box-shadow:0 0 0 2px rgba(24,144,255,.2);} -.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;} +.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;} +.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child, .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-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#f0f0f0;} .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:#ecf9ff;} 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 7bd0a978..7a4fbd55 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 @@ -164,7 +164,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .sidebar-menu {padding:0 8px 0 7px;} .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;} +.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;} @@ -211,7 +211,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .select2-container--default .select2-results__option--highlighted[aria-selected], .wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;} .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;} -.form-unit {border-bottom: 1px solid #eee;} +.form-unit {border-bottom:1px solid #eee;} .box-main>.box-header {border-bottom-color:#eeeeee;} .box-main>.box-header .box-title .fa {color:#1e5edb;} @@ -220,10 +220,10 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .select2-container--default .select2-search--dropdown .select2-search__field, .select2-container--default.select2-container--focus .select2-selection--single, .select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(24,80,236,.2);} -.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;} +.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;} +.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child, .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-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#f0f0f0;} .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:#f0f5ff;} diff --git a/common/src/main/resources/static/layer/3.5/theme/default/layer.css b/common/src/main/resources/static/layer/3.5/theme/default/layer.css index 8bee53f4..436f0c6f 100644 --- a/common/src/main/resources/static/layer/3.5/theme/default/layer.css +++ b/common/src/main/resources/static/layer/3.5/theme/default/layer.css @@ -98,7 +98,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} .layui-layer-loading .layui-layer-loading1{width:37px; height:37px; background:url(loading-1.gif) no-repeat;} .layui-layer-loading .layui-layer-loading2, .layui-layer-ico16{width:32px; height:32px; background:url(loading-2.gif) no-repeat;} .layui-layer-tips{background: none; box-shadow:none; border:none;} -.layui-layer-tips .layui-layer-content{position: relative; line-height: 22px; min-width: 12px; padding: 8px 15px; font-size: 12px; _float:left; border-radius: 3px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;} +.layui-layer-tips .layui-layer-content{position: relative; overflow:visible; line-height: 22px; min-width: 12px; padding: 8px 15px; font-size: 12px; _float:left; border-radius: 3px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;} .layui-layer-tips .layui-layer-close{right:-2px; top:-1px;} .layui-layer-tips i.layui-layer-TipsG{ position:absolute; width:0; height:0; border-width:8px; border-color:transparent; border-style:dashed; *overflow:hidden;} .layui-layer-tips i.layui-layer-TipsT, .layui-layer-tips i.layui-layer-TipsB{left:5px; border-right-style:solid; border-right-color: #000;} diff --git a/modules/core/src/test/java/application.yml b/modules/core/src/test/java/application.yml index 0262c162..5c633ffc 100644 --- a/modules/core/src/test/java/application.yml +++ b/modules/core/src/test/java/application.yml @@ -4,7 +4,7 @@ productName: JeeSite Demo companyName: ThinkGem # 产品版本、版权年份 -productVersion: V4.3 +productVersion: V4.4 copyrightYear: 2022 # 数据库连接