From 9063996fd08dc1c4e8faac29dcce5d566af6971c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 9 Sep 2020 10:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=A1=8C=E9=9D=A2=EF=BC=8C=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E5=8F=8A=E4=BD=93=E9=AA=8C=E5=86=8D=E6=AD=A4=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/adminlte/css/skins/skin-blue-light2.css     |  2 +-
 .../resources/static/adminlte/css/skins/skin-blue2.css |  9 +++++++--
 .../themes/default/modules/sys/sysIndex/topMenu.html   | 10 ++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

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 5fbfae00..174b90e4 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
@@ -45,7 +45,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   }
 }
 .main-header .logo {
-  background-color: #1890ff;
+  background-color: transparent;
   color: #ffffff;
   border-bottom: 0 solid transparent;
 }
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 6952f92d..3fccf238 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
@@ -5,7 +5,12 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   color:#1e5edb;
 }
 .main-header .navbar {
-  background-color: #1951be;
+  background: #1951be;
+  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #1951be), color-stop(1, #2780ec));
+  background: -ms-linear-gradient(left, #1951be, #2780ec);
+  background: -moz-linear-gradient(left top, #1951be 0%, #2780ec 100%);
+  background: -o-linear-gradient(#2780ec, #1951be);
+  filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 1,startColorstr='#2780ec', endColorstr='#1951be');
 }
 .main-header .navbar .nav > li > a {
   color: #ffffff;
@@ -45,7 +50,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   }
 }
 .main-header .logo {
-  background-color: #1951be;
+  background-color: transparent;
   color: #ffffff;
   border-bottom: 0 solid transparent;
 }
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
index a19f5af3..54a6680d 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-static-top">
 	<div class="logo" data-toggle="push-menu">
 		<b>${@Global.getConfig('productName')}</b>
-		<small>&nbsp; &nbsp;<i class="fa fa-bars"></i></small>
+		<small title="${text('点击缩小侧边栏，右键隐藏侧边栏')}">&nbsp; &nbsp;<i class="fa fa-bars"></i></small>
 	</div>
 	<%/*<!--%><a href="javascript:" class="sidebar-toggle" data-toggle="push-menu" role="button">
 		<span class="sr-only">菜单切换</span><span class="icon-bar"></span>
@@ -58,13 +58,13 @@
 				});
 				var refreshSidebar = function(code){
 					if(js.trim($("#leftMenu-" + code).text()) == ''){
-						$('.main-sidebar').hide();
+						$('.main-sidebar,.logo small,.tabpanel_tab_content').hide();
 						$('.content-wrapper').css("cssText","margin-left:0!important;");
 						if (window.initMenu && $(window).width() <= 767 && $('body').hasClass('sidebar-open')){
 							$('[data-toggle="push-menu"]').click();
 						}
 					}else{
-						$('.main-sidebar').show();
+						$('.main-sidebar,.logo small,.tabpanel_tab_content').show();
 						$('.content-wrapper').css('margin-left', '');
 						if (window.initMenu && $(window).width() <= 767 && !$('body').hasClass('sidebar-open')){
 							$('[data-toggle="push-menu"]').click();
@@ -78,9 +78,7 @@
 						}
 					}
 					window.initMenu = true;
-					setTimeout(function(){
-						$(window).resize();
-					},200);
+					$(window).resize();
 				}
 				// 激活存储的顶部当前菜单项
 				var currentMenuCode = js.cookie('currentMenuCode'), currentMenu;