Browse Source

dark mode

jqh 5 years ago
parent
commit
902bc1e865

+ 2 - 0
config/admin.php

@@ -313,6 +313,8 @@ return [
 
         'sidebar_dark' => false,
 
+        'dark_mode_switch' => false,
+
         // bg-primary, bg-info, bg-warning, bg-success, bg-danger, bg-dark
         'navbar_color' => '',
     ],

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

@@ -697,4 +697,22 @@ body.dark-mode {
     background-color: $body-dark-color;
     color: $body-dark-font-color
   }
+
+  // ----- selector
+  .custom-data-table .grid-selector {
+    .wrap {
+      background-color: $body-dark-color;
+    }
+
+    .select-label {
+      color: darken($body-dark-font-color, 5%);
+    }
+    ul > li a {
+      color: $body-dark-font-color;
+    }
+
+    .select-options a.active {
+      color: $primary
+    }
+  }
 }

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


+ 2 - 0
src/Console/stubs/config.stub

@@ -313,6 +313,8 @@ return [
 
         'sidebar_dark' => false,
 
+        'dark_mode_switch' => false,
+
         // bg-primary, bg-info, bg-warning, bg-success, bg-danger, bg-dark
         'navbar_color' => '',
     ],

+ 1 - 1
src/Grid/Tools/Selector.php

@@ -60,7 +60,7 @@ class Selector
 
     /**
      * @param string        $column
-     * @param string        $label
+     * @param string|array  $label
      * @param array         $options
      * @param null|\Closure $query
      *

+ 2 - 3
src/Widgets/DarkModeSwitcher.php

@@ -31,7 +31,7 @@ HTML;
 
     protected function addStyle()
     {
-        Admin::style('.dark-mode-switcher{font-size: 1.5rem;cursor: pointer}');
+        Admin::style('.dark-mode-switcher{margin:0 10px;font-size: 1.5rem;cursor: pointer}');
     }
 
     protected function addScript()
@@ -39,8 +39,7 @@ HTML;
         $default = $this->defaultDarkMode ? 'true' : 'false';
         $darkSidebar = config('admin.layout.sidebar_dark') ? 'true' : 'false';
 
-        $script =
-            <<<JS
+        $script = <<<JS
 (function() {
     var storage = localStorage || {setItem:function () {}, getItem: function () {}},
         key = 'dcat-admin-theme-mode',

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