Browse Source

美化菜单样式

jqh 4 years ago
parent
commit
216c594788

+ 4 - 4
resources/assets/adminlte/scss/_main-sidebar.scss

@@ -22,13 +22,13 @@
 
   .nav-treeview.nav {
     .nav-item .nav-link {
-      padding: 7px 10px 7px 15px!important;
+      padding: 5px 10px 7px 15px!important;
       //margin-right: 0;
     }
 
-    .nav-item .nav-link.active {
-      padding: 8px 10px 8px 15px!important;
-    }
+    //.nav-item .nav-link.active {
+    //    //  padding: 8px 10px 8px 15px!important;
+    //    //}
   }
 }
 

+ 61 - 2
resources/assets/dcat/sass/components/_menu.scss

@@ -1,4 +1,9 @@
 
+.layout-fixed .main-sidebar {
+  background: url(/vendors/dcat-admin/images/waves.png) no-repeat;
+  background-color: #fff;
+}
+
 .main-menu {
   .navbar-header {
     padding: 0.35rem 1rem 0;
@@ -17,11 +22,13 @@
     .logo-mini {
       display: none;
       font-size: 1.8rem;
-      color: darken($primary-darker, 1%);
+      //color: darken($primary-darker, 1%);
+      color: $font-color;
     }
 
     .logo-lg {
-      color: darken($primary-darker, 1%);
+      //color: darken($primary-darker, 1%);
+      color: $font-color;
       letter-spacing: 0.01rem;
       font-size: 1.55rem;
       -webkit-animation: 0.3s cubic-bezier(0.25, 0.8, 0.25, 1) 0s normal forwards 1 fadein;
@@ -98,3 +105,55 @@ body.sidebar-collapse {
   }
 }
 
+[class*=sidebar-light-] .nav-treeview>.nav-item>.nav-link.active, [class*=sidebar-light-] .nav-treeview>.nav-item>.nav-link.active:hover {
+  color: $primary-darker;
+  background: none;
+  box-shadow: 0 0;
+}
+
+.sidebar-light-primary .nav-item > .nav-link.active {
+  background: none;
+  color: $primary-darker !important;
+  font-weight: bold;
+  box-shadow: 0 0;
+}
+
+.nav-sidebar>.nav-item>.nav-treeview  .nav-link p {
+  font-size: 14px;
+}
+
+.main-menu .navbar-header .navbar-brand {
+  margin-top: 1rem;
+}
+
+// ----- sidebar-separate
+body.sidebar-separate {
+  .main-sidebar {
+    top: 6rem;
+    left: 1.5rem;
+    text-align: center;
+  }
+
+  .header-navbar.fixed-top {
+    left: 0;
+  }
+
+  .sidebar-collapse .header-navbar.fixed-top {
+    left: 0;
+  }
+
+  @media (min-width: 768px) {
+    .content-wrapper {
+      margin-left: 280px;
+    }
+  }
+
+  .main-sidebar .nav-sidebar .nav-item>.nav-link {
+    text-align: left;
+  }
+}
+
+body.sidebar-separate.dark-mode [class*=sidebar-dark-] .navbar-header {
+  background: unset!important;
+}
+

+ 7 - 0
resources/assets/dcat/sass/theme/_dark.scss

@@ -867,4 +867,11 @@ body.dark-mode {
       padding: 10px 10px 10px 15px !important;
     }
   }
+
+  .main-sidebar .sidebar {
+    margin-top: 1rem
+  }
+  .main-menu .navbar-header .navbar-brand {
+    margin-top: .5rem;
+  }
 }

BIN
resources/assets/images/pages/login/bg.jpg


BIN
resources/assets/images/waves.png


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue-dark.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue-light.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-green.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue-dark.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue-light.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-green.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/action.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/resource-selector.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/js/dcat-app.js.map


BIN
resources/dist/images/pages/login/bg.jpg


BIN
resources/dist/images/waves.png


+ 1 - 1
resources/views/partials/sidebar.blade.php

@@ -13,7 +13,7 @@
             </div>
 
             <div class="sidebar pb-3">
-                <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" style="padding-top: 10px">
+                <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" style="padding-top: 5px">
                     {!! admin_section(AdminSection::LEFT_SIDEBAR_MENU_TOP) !!}
 
                     {!! admin_section(AdminSection::LEFT_SIDEBAR_MENU) !!}

Some files were not shown because too many files changed in this diff