jqh 4 years ago
parent
commit
66425deb15

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

@@ -124,9 +124,12 @@ body.sidebar-separate {
     top: 6rem;
     left: 1.5rem;
     text-align: center;
-    background: url(/vendors/dcat-admin/images/waves.png) no-repeat;
     background-color: #fff;
   }
+  //.main-sidebar:not(.sidebar-primary) {
+  //  background: url(/vendors/dcat-admin/images/waves.png) no-repeat;
+  //  background-color: #fff;
+  //}
 
   .navbar-header {
     .logo-lg,
@@ -135,7 +138,7 @@ body.sidebar-separate {
     }
 
     .navbar-brand {
-      margin-top: 1rem;
+      margin-top: 1rem!important;
     }
   }
 
@@ -157,6 +160,8 @@ body.sidebar-separate {
 
 body.sidebar-separate.dark-mode [class*=sidebar-dark-] .navbar-header {
   background: unset!important;
+  height: auto;
+  padding: 0.35rem 1rem 0;
 }
 
 //

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

@@ -848,7 +848,7 @@ body.dark-mode {
 
   // ------- sidebar
   [class*=sidebar-dark-] {
-    background-color: $body-dark-color;
+    background-color: $body-dark-color!important;
 
     .navbar-header {
       background: $body-darker-color;
@@ -870,10 +870,13 @@ body.dark-mode {
     }
   }
 
-  .main-sidebar .sidebar {
-    margin-top: 1rem
-  }
   .main-menu .navbar-header .navbar-brand {
     margin-top: .5rem;
   }
 }
+
+body.dark-mode:not(.sidebar-separate) {
+  .main-sidebar .sidebar {
+    margin-top: 1rem
+  }
+}

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/extra/select-table.js.map


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


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