Browse Source

新增菜单导航显示风格(default为左侧导航菜单,topnav为顶部导航菜单)

Ricky 4 years ago
parent
commit
8a5744f492

+ 12 - 1
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 {

+ 3 - 3
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">