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 271a3743..944ce0a9 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 @@ -169,7 +169,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor /* 页签添加内边距 */ .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_content .html_content {padding:13px 14px 13px 15px;} .tabpanel_tab_content {border-bottom:0;} .ui-layout-resizer {background:none;} .content {padding:0!important} 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 d0c8ccb4..ed6fed4d 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 @@ -169,7 +169,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor /* 页签添加内边距 */ .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_content .html_content {padding:13px 14px 13px 15px;} .tabpanel_tab_content {border-bottom:0;} .ui-layout-resizer {background:none;} .content {padding:0!important} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css index 5ee47eec..f0e2f176 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css @@ -167,7 +167,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor /* 页签添加内边距 */ .content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#000;} .box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;} -.tabpanel_content .html_content {padding:14px 14px 13px 15px;} +.tabpanel_content .html_content {padding:13px 14px 13px 15px;} .tabpanel_tab_content {border-bottom:0;} .ui-layout-resizer {background:none;} .content {padding:0!important} diff --git a/modules/core/src/main/resources/views/layouts/default.html b/modules/core/src/main/resources/views/layouts/default.html index 014921e9..bbfe9e67 100644 --- a/modules/core/src/main/resources/views/layouts/default.html +++ b/modules/core/src/main/resources/views/layouts/default.html @@ -13,7 +13,7 @@ var skinName = cookie('skinName', false, defaultSkinName); print('<'+'!DOC'+'TYPE html'+'><'+'html class="'+skinName+'"><'+'head'+'>'); include('/include/head.html', {title: text(title!)}){} include('/themes/'+themeName+'/include/header.html', {libs: libs!, skinName: skinName!}){} %> - + <% if (!@ListUtils.inString('layout', libs!)){ %>
${layoutContent}
<% }else{ %>${layoutContent}<% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html index 74936130..2029da36 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html @@ -195,7 +195,7 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({ ], // autoGridWidthFix: 100, autoGridHeight: function(){ - var height = $(window).height() - $('#searchForm').height() - $('#dataGridPage').height() - 70; + var height = $(window).height() - $('#searchForm').height() - $('#dataGridPage').height() - 78; $('.tags-input').height($('.ui-jqgrid').height() - 10); return height; }, diff --git a/modules/core/src/main/resources/views/modules/sys/user/userSelect.html b/modules/core/src/main/resources/views/modules/sys/user/userSelect.html index 4e80d37c..ea257405 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/userSelect.html +++ b/modules/core/src/main/resources/views/modules/sys/user/userSelect.html @@ -81,7 +81,7 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({ }} ], autoGridHeight: function(){ - var height = $(window).height() - $('#searchForm').height() - $('#dataGridPage').height() - 74; + var height = $(window).height() - $('#searchForm').height() - $('#dataGridPage').height() - 78; $('.tags-input').height($('.ui-jqgrid').height() - 10); return height; },