Browse Source

美化菜单样式

jqh 4 years ago
parent
commit
37c1b32daa

+ 14 - 16
resources/assets/dcat/sass/components/_menu.scss

@@ -1,9 +1,3 @@
-
-.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;
@@ -22,13 +16,11 @@
     .logo-mini {
       display: none;
       font-size: 1.8rem;
-      //color: darken($primary-darker, 1%);
-      color: $font-color;
+      color: darken($primary-darker, 1%);
     }
 
     .logo-lg {
-      //color: darken($primary-darker, 1%);
-      color: $font-color;
+      color: darken($primary-darker, 1%);
       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;
@@ -122,22 +114,28 @@ body.sidebar-collapse {
   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;
+    background: url(/vendors/dcat-admin/images/waves.png) no-repeat;
+    background-color: #fff;
   }
 
-  .header-navbar.fixed-top {
-    left: 0;
+  .navbar-header {
+    .logo-lg,
+    .logo-mini {
+      color: $font-color;
+    }
+
+    .navbar-brand {
+      margin-top: 1rem;
+    }
   }
 
+  .header-navbar.fixed-top,
   .sidebar-collapse .header-navbar.fixed-top {
     left: 0;
   }

+ 11 - 4
resources/assets/dcat/sass/components/_table.scss

@@ -203,17 +203,20 @@ $table-border-color: #eff3f8;
   }
 }
 
+
+$table-bg: darken(#f7f7f9, 3.5%);
+
 body:not(.dark-mode) {
   .table-collapse {
     box-shadow: $shadow;
-    background: darken(#f7f7f9, 3.5%);
+    background: $table-bg;
     margin-top: 1rem;
 
     .custom-data-table {
       border-spacing: 0;
       //border-collapse:collapse!important;
       margin-top: 0!important;
-      background-color: darken(#f7f7f9, 3.5%);
+      background-color: $table-bg;
       //border-radius: $card-border-radius;
     }
 
@@ -225,9 +228,13 @@ body:not(.dark-mode) {
       //background: $white;
     }
 
-    table.custom-data-table.dataTable tbody td {
+    .custom-data-table.dataTable tbody td {
       border-top: 1px solid $table-border-color;
-      height: 42px;
+      height: 45px;
+    }
+
+    .custom-data-table.dataTable tbody tr:first-child td {
+      border-top: 0
     }
 
     table.custom-data-table.dataTable tbody tr {

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


+ 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: 5px">
+                <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" style="padding-top: 10px">
                     {!! 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