From 8a5744f492987db0d0b34289ba9d5c43cb4fe7c7 Mon Sep 17 00:00:00 2001
From: Ricky <11748854@qq.com>
Date: Fri, 4 Sep 2020 11:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=98=BE=E7=A4=BA=E9=A3=8E=E6=A0=BC=EF=BC=88default?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8Ctopnav=E4=B8=BA=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/css/style.css | 13 ++++++++++++-
 .../src/main/resources/templates/index-topnav.html  |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css
index 03e114acb..14c1eb999 100644
--- a/ruoyi-admin/src/main/resources/static/css/style.css
+++ b/ruoyi-admin/src/main/resources/static/css/style.css
@@ -280,6 +280,8 @@ body.body-small .navbar-top-links li:last-child {
 
 .nav-second-level li, .nav-third-level li {
     border-bottom: none !important;
+    padding-left: 2px;
+    padding-right: 2px;
 }
 
 .nav-second-level li a {
@@ -288,7 +290,7 @@ body.body-small .navbar-top-links li:last-child {
 }
 
 .nav-third-level li a {
-    padding-left: 62px;
+    padding-left: 70px;
 }
 
 .nav-second-level li:last-child {
@@ -307,6 +309,10 @@ body.mini-navbar .navbar-default .nav>li>.nav-second-level li a {
     border-radius: 0 2px 2px 0;
 }
 
+body.mini-navbar .navbar-default .nav>li>.nav-third-level li a {
+    padding-left: 31px;
+}
+
 .fixed-nav .slimScrollDiv #side-menu {
     padding-bottom: 60px;
     position: relative;
@@ -495,6 +501,11 @@ body.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
     min-width: 140px;
     border-radius: 2px;
 }
+
+.fixed-sidebar.mini-navbar .nav .nav-second-level a> span, .fixed-sidebar.mini-navbar .nav .nav-third-level a> span {
+    display: inline-block;
+}
+
 /*伸缩菜单结束*/
 
 body.fixed-sidebar.mini-navbar .navbar-default .nav>li>.nav-second-level li a {
diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index 39ef00a0c..3c8a13dd7 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -53,7 +53,7 @@
 			        <i th:class="${cmenu.icon} + ' fa-fw'"></i> <span class="nav-label">[[${cmenu.menuName}]]</span>
 			      </a>
 			      <a class="menu-content" th:if="${not #lists.isEmpty(cmenu.children)}" href="#">
-			        <i th:class="${cmenu.icon} + 'fa-fw'"></i>
+			        <i th:class="${cmenu.icon} + ' fa-fw'"></i>
 			        <span class="nav-label">[[${cmenu.menuName}]]</span>
 			        <span class="fa arrow"></span>
                   </a>
@@ -61,11 +61,11 @@
 				    <li th:each="emenu : ${cmenu.children}">
 				      <a th:if="${#lists.isEmpty(emenu.children)}" th:href="@{${emenu.url}}" th:class="${#strings.isEmpty(emenu.target)} ? |menuItem| : ${emenu.target}">
 				        <i th:class="${emenu.icon} + ' fa-fw'"></i> 
-				        <span class="nav-label">[[${emenu.menuName}]]</span>
+				        [[${emenu.menuName}]]
 				      </a>
 				      <a th:if="${not #lists.isEmpty(emenu.children)}" href="#">
 				        <i th:class="${emenu.icon} + ' fa-fw'"></i> 
-				        <span class="nav-label">[[${emenu.menuName}]]</span>
+				        [[${emenu.menuName}]]
 				        <span class="fa arrow"></span>
 				      </a>
 				      <ul th:if="${not #lists.isEmpty(emenu.children)}" class="nav nav-third-level collapse">