新皮肤

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

@@ -16,7 +16,19 @@
   }
 
   .nav .nav-item .nav-link {
-    padding: 10px 15px!important;
+    padding: 10px 10px 10px 15px!important;
+    margin-right: 0;
+  }
+
+  .nav-treeview.nav {
+    .nav-item .nav-link {
+      padding: 7px 10px 7px 15px!important;
+      margin-right: 0;
+    }
+
+    .nav-item .nav-link.active {
+      padding: 10px 10px 10px 15px!important;
+    }
   }
 }
 
@@ -98,8 +110,11 @@
   }
 
   .menu-open {
+    //background: $sidebar-dark-submenu-bg;
+
     > .nav-treeview {
       display: block;
+      border-radius: 0;
     }
 
     > .nav-link {
@@ -352,6 +367,26 @@
   // Sidebar background color
   background-color: $sidebar-dark-bg;
 
+  //.nav .nav-item .nav-link {
+  //
+  //}
+
+  .nav-treeview.nav {
+     .nav-item .nav-link {
+       //padding: 7px 0 7px 15px!important;
+      font-size: 1rem!important;
+       margin-bottom: 0
+    }
+
+    .nav-item .nav-link.active {
+      padding: 7px 10px 7px 15px!important;
+    }
+  }
+
+  .nav-sidebar .nav-link > p > .right {
+    right: .5rem
+  }
+
   // User Panel (resides in the sidebar)
   .user-panel {
     a:hover {

resources/assets/adminlte/scss/_sidebar-mini.scss

@@ -75,7 +75,7 @@
 
   .main-sidebar {
     .nav .nav-item .nav-link {
-      padding: 10px 23px !important;
+      padding: 10px 21px !important;
     }
 
     .nav .menu-open .nav-treeview {

resources/assets/adminlte/scss/_variables.scss

@@ -109,21 +109,37 @@ $main-footer-bg: transparent !default;
 //$sidebar-dark-bg: #1e1e2d !default;
 //$sidebar-dark-bg: lighten(#1a1a27, 1%) !default;
 //$sidebar-dark-bg: #263238!default;
-$sidebar-dark-bg: $body-dark-color!default;
+//$sidebar-dark-bg: $body-dark-color!default;
+//$sidebar-dark-hover-bg: transparent !default;
+//$sidebar-dark-color: $body-dark-font-color!default;
+//$sidebar-dark-hover-color: $white !default;
+//$sidebar-dark-active-bg: $body-darker-color !default;
+//$sidebar-dark-active-color: $white !default;
+//$sidebar-dark-submenu-bg: transparent !default;
+////$sidebar-dark-submenu-color: lighten(#C2C7D0, 6%) !default;
+//$sidebar-dark-submenu-color: $body-dark-font-color!default;
+//$sidebar-dark-submenu-hover-color: $white !default;
+//$sidebar-dark-submenu-hover-bg: $sidebar-dark-hover-bg !default;
+//$sidebar-dark-submenu-active-color: $white !default;
+//$sidebar-dark-submenu-active-bg: $sidebar-dark-active-bg !default;
+//$sidebar-dark-header-color: hsla(0,0%,100%,.7) !default;
+
+// #262d37
+$sidebar-dark-bg: darken(#505b6b, 2%)!default;
 $sidebar-dark-hover-bg: transparent !default;
-$sidebar-dark-color: $body-dark-font-color!default;
+$sidebar-dark-color: $white!default;
 $sidebar-dark-hover-color: $white !default;
-$sidebar-dark-active-bg: $body-darker-color !default;
+$sidebar-dark-active-bg: darken(#49525f, 4%) !default;
 $sidebar-dark-active-color: $white !default;
-$sidebar-dark-submenu-bg: transparent !default;
+$sidebar-dark-submenu-bg: darken(#49525f, 1%) !default;
 //$sidebar-dark-submenu-color: lighten(#C2C7D0, 6%) !default;
-$sidebar-dark-submenu-color: $body-dark-font-color!default;
-
+$sidebar-dark-submenu-color: $sidebar-dark-color!default;
 $sidebar-dark-submenu-hover-color: $white !default;
 $sidebar-dark-submenu-hover-bg: $sidebar-dark-hover-bg !default;
 $sidebar-dark-submenu-active-color: $white !default;
-$sidebar-dark-submenu-active-bg: $sidebar-dark-active-bg !default;
-$sidebar-dark-header-color: hsla(0,0%,100%,.7) !default;
+$sidebar-dark-submenu-active-bg: rgba(255,255,255, 0.12) !default;
+$sidebar-dark-header-color: hsla(0,0%,100%,.8) !default;
+// #505b6b #49525f
 
 // Light sidebar
 $sidebar-light-bg: $white !default;

resources/assets/dcat/sass/components/_content-header.scss

@@ -7,6 +7,10 @@
   padding: 0 0 2px;
 }
 
+.breadcrumbs-top {
+  margin-bottom: 1.2rem;
+}
+
 // 页面标题
 .content-header h1 {
   font-weight: 400;

resources/assets/dcat/sass/components/_menu.scss

@@ -76,7 +76,7 @@ body.sidebar-collapse {
 
 .main-sidebar {
   .nav-sidebar .nav-item > .nav-link {
-    font-size: 1.05rem;
+    font-size: 1.04rem;
     border-radius: .1rem;
   }
 }
@@ -89,10 +89,12 @@ body.sidebar-collapse {
   .navbar-header {
     padding: 0 1rem 0;
     height: 61px;
-    background: $body-darker-color;
+    //background: $body-darker-color;
+    background: #262d37
   }
 
   .navbar-header .navbar-brand {
     margin: 8px 0;
   }
 }
+

resources/assets/dcat/sass/dcat-app.scss

@@ -114,3 +114,5 @@ li {
 
 // dark mode
 @import "./theme/dark";
+
+@import "./skins/2nd";

resources/assets/dcat/sass/skins/_2nd.scss

@@ -0,0 +1,76 @@
+
+$table-border-color: #eff3f8;
+
+
+body.dcat-2nd {
+  table.dataTable {
+    border-collapse:collapse!important;
+    margin-top: 0!important;
+  }
+
+  .custom-data-table.dcat-box {
+    background: $white;
+    box-shadow: $shadow;
+
+    .box-footer {
+      border-top: 1px solid $table-border-color;
+      padding-bottom: 10px!important;
+    }
+  }
+
+  .custom-data-table-header {
+    padding: 10px;
+
+    .btn {
+      background-color: transparent !important;
+      border-color: transparent !important;
+      box-shadow: none!important;
+      color: $dark80!important;
+      font-weight: bold;
+      //font-size: 14px;
+    }
+    .btn-group {
+      box-shadow: none!important;
+    }
+  }
+
+  table.custom-data-table.dataTable tbody tr td:first-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  table.custom-data-table.dataTable tbody tr td:last-child{
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+
+  table.dataTable thead tr {
+    background: $white;
+  }
+
+  table.custom-data-table.dataTable thead th {
+    border-top: 1px solid #e3e7eb;
+    border-bottom: 1px solid #e3e7eb;
+    background: $dark30;
+  }
+
+  table.custom-data-table.dataTable tbody td {
+    border-top: 1px solid $table-border-color;
+    height: 38px;
+  }
+
+  table.custom-data-table.dataTable tbody tr {
+    box-shadow: none;
+  }
+
+  .custom-data-table-header .table-responsive .top .dataTables_filter .form-control {
+    box-shadow: none;
+    border-radius: 0;
+    border-bottom: 2px solid $input-border-color;
+  }
+}
+
+body.dcat-2nd.dark-mode {
+
+}
+

resources/assets/dcat/sass/theme/_dark.scss

@@ -843,4 +843,28 @@ body.dark-mode {
   .table-fixed-right {
     box-shadow: -5px 0 5px -5px rgba(0,0,0,.24);
   }
+
+  // ------- sidebar
+  [class*=sidebar-dark-] {
+    background-color: $body-dark-color;
+
+    .navbar-header {
+      background: $body-darker-color;
+    }
+
+    .nav-sidebar > .nav-item > .nav-treeview {
+      background: transparent;
+    }
+
+    .nav-sidebar > .nav-item > .nav-link.active,
+    .nav-treeview > .nav-item > .nav-link.active,
+    .nav-treeview > .nav-item > .nav-link.active:hover,
+    .nav-treeview > .nav-item > .nav-link.active:focus {
+      background: $body-darker-color;
+    }
+
+    .nav-treeview.nav .nav-item .nav-link.active {
+      padding: 10px 10px 10px 15px !important;
+    }
+  }
 }

resources/views/layouts/content.blade.php

@@ -1,5 +1,5 @@
 @section('content-header')
-    <section class="content-header breadcrumbs-top mb-2">
+    <section class="content-header breadcrumbs-top">
         @if($header || $description)
             <h1 class=" float-left">
                 <span class="text-capitalize">{!! $header !!}</span>