dark mode

resources/assets/dcat/js/extensions/DarkMode.js

@@ -12,10 +12,6 @@ export default class DarkMode {
         };
 
         Dcat.darkMode = this;
-
-        if (this.options.dark_mode) {
-            this.switch(true)
-        }
     }
 
     toggle() {

resources/views/layouts/full-page.blade.php

@@ -20,10 +20,10 @@
 
     {!! admin_section(\AdminSection::HEAD) !!}
 
-    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
-
     {!! Dcat\Admin\Admin::asset()->headerJsToHtml() !!}
 
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
+
     @yield('head')
 </head>
 

resources/views/layouts/page.blade.php

@@ -20,10 +20,10 @@
 
     {!! admin_section(\AdminSection::HEAD) !!}
 
-    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
-
     {!! Dcat\Admin\Admin::asset()->headerJsToHtml() !!}
 
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
+
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>

src/Layout/Content.php

@@ -6,6 +6,7 @@ use Closure;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Traits\HasBuilderEvents;
 use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Support\ViewErrorBag;
 
@@ -505,6 +506,10 @@ JS
             }
         }
 
+        if ($data['body_class'] && Str::contains($data['body_class'], 'dark-mode')) {
+            $data['sidebar_dark'] = true;
+        }
+
         return [
             'theme' => $data['theme'],
             'sidebar_collapsed' => $data['sidebar_collapsed'],