update

resources/assets/adminlte/scss/_cards.scss

@@ -14,7 +14,7 @@
 .card {
   @include box-shadow($card-shadow);
   margin-bottom: map-get($spacers, 3);
-
+  border: 0;
   &.bg-dark {
     .card-header {
       border-color: $card-dark-border-color;

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

@@ -250,6 +250,11 @@
       &:focus {
         color: $sidebar-light-color;
       }
+
+      i {
+        margin-right: .8rem;
+        font-size: 1.2rem;
+      }
     }
 
     // Hover and active states

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

@@ -67,6 +67,25 @@
     .nav-header {
       display: inline-block;
     }
+
+    .nav .nav-treeview {
+      display: block;
+    }
+  }
+
+  .main-sidebar {
+    .nav .nav-item .nav-link {
+      padding: 10px 25px !important;
+    }
+
+    .nav .nav-treeview {
+      display: none;
+    }
+  }
+
+  // navbar
+  .header-navbar.floating-nav {
+    width: calc(100vw - (100vw - 100%) - 70px - #{$sidebar-mini-width});
   }
 
   .sidebar-no-expand.main-sidebar.sidebar-focused,

resources/assets/adminlte/scss/_variables.scss

@@ -32,7 +32,7 @@ $colors: map-merge((
 $font-size-root: 1rem !default;
 
 // Sidebar
-$sidebar-width: 250px !default;
+$sidebar-width: 260px !default;
 $sidebar-padding-x: 0.5rem !default;
 $sidebar-padding-y: 0 !default;
 
@@ -134,9 +134,9 @@ $sidebar-light-header-color: $gray-800 !default;
 
 // SIDEBAR MINI
 // --------------------------------------------------------
-$sidebar-mini-width: ($nav-link-padding-x + $sidebar-padding-x + .8rem) * 2 !default;
-$sidebar-nav-icon-width: $sidebar-mini-width - (($sidebar-padding-x + $nav-link-padding-x) * 2) !default;
-$sidebar-user-image-width: $sidebar-nav-icon-width + ($nav-link-padding-x / 2) !default;
+$sidebar-mini-width: ($nav-link-padding-x + $sidebar-padding-x + .8rem) * 3 !default;
+$sidebar-nav-icon-width: $sidebar-mini-width - (($sidebar-padding-x + $nav-link-padding-x) * 3) !default;
+$sidebar-user-image-width: $sidebar-nav-icon-width + ($nav-link-padding-x / 3) !default;
 
 // CONTROL SIDEBAR
 // --------------------------------------------------------

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

@@ -1,5 +1,5 @@
 .btn {
-  padding: 0.7rem 1.2rem !important;
+  padding: 0.5rem 1.2rem !important;
   font-size: 0.9rem;
   height: 38px;
   line-height: 0.1;
@@ -23,7 +23,7 @@
 }
 
 .btn-sm, .btn-group-sm > .btn {
-  padding: 0.6rem 1rem !important;
+  padding: 0.45rem 1rem !important;
   font-size: 0.6rem;
   line-height: 1;
   height: 30px;

resources/assets/dcat/sass/components/_custom-data-table.scss

@@ -51,9 +51,13 @@
 }
 
 .custom-data-table-header .table-responsive .top .dataTables_filter .form-control{
-  padding: 1.45rem 2.8rem !important;
-  border-radius: 1.428rem;
-  border: 1px solid #dae1e7
+  //padding: 1.45rem 2.8rem !important;
+  //border-radius: 1.428rem;
+  //border: 1px solid #dae1e7;
+  padding: 1.2rem 2.8rem !important;
+  border-radius: 1.4rem;
+  border: 0;
+  box-shadow: $shadow;
 }
 
 .custom-data-table-header .table-responsive .top .dataTables_filter label{

resources/assets/dcat/sass/components/_header-navbar.scss

@@ -1,3 +1,6 @@
 .header-navbar.navbar-shadow {
   box-shadow: $shadow;
 }
+.header-navbar.floating-nav {
+  margin: 1.3rem 2.35rem 0;
+}

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

@@ -36,13 +36,6 @@ table.dataTable {
   padding-left: 1.4rem;
 }
 
-// 快捷搜索
-.custom-data-table-header .table-responsive .top .dataTables_filter .form-control, .data-thumb-view-header .table-responsive .top .dataTables_filter .form-control {
-  padding: 1.23rem 2.8rem !important;
-  border-radius: 1.4rem;
-  border: 0;
-  box-shadow: $shadow;
-}
 
 .card-header.custom-data-table-header .table-responsive .top .dataTables_filter .form-control {
   box-shadow: $shadow-100;

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

@@ -27,12 +27,16 @@ body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5 {
 }
 
 html body .content .content-wrapper {
-  padding: calc(2.2rem - 0.4rem) 2.45rem 0;
+  padding: calc(2.2rem - 0.4rem) 2.1rem 0;
   //margin-top: 3.5rem;
 }
 
 .content-header {
-  padding: 15px 0 2px;
+  padding: 20px 0 2px;
+}
+
+.navbar-fixed .content-header {
+  padding: 10px 0 2px;
 }
 
 ol, ul, dl {

resources/assets/dcat/sass/variables/_variables.scss

@@ -5,6 +5,7 @@
 @import "../../../sass/core/variables/variables";
 @import "../../../sass/bootstrap/variables";
 
+
 @import "./colors";
 
 $font-family-sans-serif: Nunito, Montserrat,system-ui,BlinkMacSystemFont,-apple-system,sans-serif;

resources/assets/sass/bootstrap-extended.scss

@@ -43,4 +43,4 @@
 //@import "bootstrap-extended/popover";
 
 // // Utility classes
-//@import "bootstrap-extended/utilities";
+@import "bootstrap-extended/utilities";

resources/assets/sass/bootstrap-extended/_modal.scss

@@ -1,142 +0,0 @@
-// Modals
-
-.modal {
-
-  // Modal Header
-
-  .modal-header {
-    background-color: $body-bg;
-    border-radius: .42rem;
-    padding: .8rem;
-    border-bottom: none;
-
-    // close button
-
-    .close {
-      padding: .2rem .62rem;
-      box-shadow: 0 5px 20px 0 rgba($pure-black, .1);
-      border-radius: .357rem;
-      background: $white;
-      opacity: 1;
-      transition: all .23s ease .1s;
-      position: relative;
-      transform: translate(8px, -2px);
-      span{
-        font-weight: 400;
-        font-size: 2rem;
-        color: $primary;
-      }
-      // For hover effect of close btn
-
-      &:hover,
-      &:focus,&:active {
-        opacity: 1;
-        outline: none;
-        transform: translate(5px, 3px);
-        box-shadow: none;
-      }
-    }
-
-    &[class*="bg-"]{
-      color: $white;
-      border-bottom-left-radius: 5px;
-      border-bottom-right-radius: 5px;
-
-      .modal-title {
-        color: $white;
-      }
-    }
-
-    // Themed Modals
-    &.bg-primary {
-      .close {
-        span {
-          color: $primary;
-        }
-      }
-    }
-
-    &.bg-success {
-      .close {
-        span {
-          color: $success;
-        }
-      }
-    }
-
-    &.bg-info {
-      .close {
-        span {
-          color: $info;
-        }
-      }
-    }
-
-    &.bg-danger {
-      .close {
-        span {
-          color: $danger;
-        }
-      }
-    }
-
-    &.bg-warning {
-      .close {
-        span {
-          color: $warning;
-        }
-      }
-    }
-
-    &.bg-dark {
-      .close {
-        span {
-          color: $dark;
-        }
-      }
-    }
-  }
-
-  // Modal Content
-  .modal-content {
-    border: none;
-    // overflow: unset; updated to "visible" as close icon is not visible in IE
-    overflow: visible;
-    box-shadow: 0 5px 20px 0 rgba($pure-black, .1);
-  }
-
-  // Modal Footer
-  .modal-footer {
-    border-color: rgba($pure-black, .05);
-  }
-}
-
-// Modal SM
-.modal-sm {
-  max-width: 400px;
-}
-
-// Modal XS
-.modal-xs {
-  max-width: 300px;
-}
-
-// Modal XL
-.modal-xl {
-  max-width: 94%;
-  margin-left: 3%;
-  margin-right: 3%;
-}
-
-// To remove Max-width of XS Modal in Small Screen
-
-@media(max-width:576px) {
-  .modal {
-    padding-right: 1rem;
-    padding-left: 1rem;
-    .modal-xs,
-    .modal-sm {
-      max-width: unset;
-    }
-  }
-}

resources/assets/sass/bootstrap-extended/_navbar.scss

@@ -1,13 +1,3 @@
-/* ===============================================================================================
-    File Name: navbar.scss
-    Description: Contain header navigation bar, vertical main navigation bar and
-    horiznotal main navigation bar related SCSS.
-    ----------------------------------------------------------------------------------------------
-    Item Name: Vuexy  - Vuejs, HTML & Laravel Admin Dashboard Template
-    Author: PIXINVENT
-    Author URL: http://www.themeforest.net/user/pixinvent
-================================================================================================*/
-
 %extend_hamburger_color {
 
   .hamburger-inner,
@@ -279,7 +269,7 @@
           padding: 1.34rem 0.22rem 1.35rem 0;
 
           i {
-            font-size: 1.75rem;
+            font-size: 1.4rem;
           }
         }
 

resources/assets/sass/core/variables/_components-variables.scss

@@ -43,7 +43,7 @@ $gradient-button-bs: 0 8px 25px -8px #aaa;
 //  ------------------------------
 //    Navbar
 //  ------------------------------
-$navbar-height: 5rem;
+$navbar-height: 4.3rem;
 
 
 //  ------------------------------

resources/views/partials/navbar.blade.php

@@ -8,8 +8,8 @@
         <div class="navbar-container content">
             <div class="mr-auto float-left bookmark-wrapper d-flex align-items-center">
                 <ul class="nav navbar-nav">
-                    <li class="nav-item mobile-menu d-md-none mr-auto">
-                        <a class="nav-link nav-menu-main menu-toggle " href="#">
+                    <li class="nav-item mr-auto">
+                        <a class="nav-link nav-menu-main menu-toggle " data-widget="pushmenu" href="#">
                             <i class="ficon feather icon-menu"></i>
                         </a>
                     </li>

resources/views/partials/sidebar.blade.php

@@ -1,5 +1,4 @@
-<div class="main-menu {{($configData['theme'] === 'light') ? 'menu-light' : 'menu-dark'}} menu-shadow"
-        data-scroll-to-active="true">
+<div class="main-menu">
 {{--    <div class="navbar-header">--}}
 {{--        <ul class="nav navbar-nav flex-row">--}}
 {{--            <li class="nav-item mr-auto">--}}
@@ -27,7 +26,6 @@
             </a>
 
             <div class="sidebar">
-                <div class="mb-3"></div>
 
                 <nav class="mt-2">
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">

src/Color.php

@@ -63,16 +63,6 @@ class Color
      * @var array
      */
     protected static $colors = [
-        'cyan' => [
-            'css' => [
-
-            ],
-            'colors' => [
-                'primary'        => 'cyan',
-                'primary-darker' => 'cyan-darker',
-                'link'           => 'cyan-darker',
-            ],
-        ],
         'indigo' => [
             'css' => [