增加blue,blue-light主题颜色

config/admin.php

@@ -312,6 +312,9 @@ return [
     | This value is the layout of admin pages.
     */
     'layout' => [
+        // Support indigo, blue, blue-light
+        'color' => 'indigo',
+
         'body_class' => '',
 
         'sidebar_collapsed' => false,

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

@@ -14,16 +14,16 @@ $gray-900: #2a2e30;
 $black: #22292f;
 
 //$indigo: #4d5ec1;
-$indigo: #5c6bc6;
+$indigo: #3d97dd;
 
-$blue: #3085d6; //$info
+$blue: #4277cf; //$info
 $red: #ea5455; //$danger
 $orange: #dda451; //$warning
 $green: #21b978; //$success
 $cyan: #7367f0; //$primary
 
 
-$primary: $indigo;
+$primary: #4199de;
 $info: $blue;
 $warning: $orange;
 

resources/dist/dcat/extra/markdown-blue-light.css

@@ -0,0 +1 @@
+.editormd-html-preview code,.editormd-preview-container code{font-size:13px!important;font-family:Inconsolata,Fira Mono,Consolas,Liberation Mono,Menlo,Courier,monospace!important;word-wrap:break-word!important}.markdown-body pre code{box-shadow:none}.com{color:#93939e!important}.tag,.typ{color:#da564a!important}.clo,.opn{color:#93a1a1!important}.atn,.lit{color:#007ee5!important}.atv{color:#fc8bb3!important}.dec,.var{color:teal!important}.fun{color:#dc322f!important}pre.prettyprint{padding:10px;border:1px solid #e1e1e8!important;-moz-tab-size:4!important;-o-tab-size:4!important;tab-size:4!important}pre.prettyprint.linenums{box-shadow:inset 40px 0 0 hsla(0,0%,93.3%,.35),inset 41px 0 0 hsla(0,0%,93.3%,.35)!important}pre.prettyprint.linenums ol.linenums{color:#1e347b!important;padding-left:30px!important;margin-top:0!important;margin-bottom:0}pre.prettyprint.linenums ol.linenums li{color:#bebec5!important;line-height:18px!important;padding-left:12px!important;background:#f7f7f9!important}pre.prettyprint.linenums ol.linenums li.L0,pre.prettyprint.linenums ol.linenums li.L1,pre.prettyprint.linenums ol.linenums li.L2,pre.prettyprint.linenums ol.linenums li.L3,pre.prettyprint.linenums ol.linenums li.L4,pre.prettyprint.linenums ol.linenums li.L5,pre.prettyprint.linenums ol.linenums li.L6,pre.prettyprint.linenums ol.linenums li.L7,pre.prettyprint.linenums ol.linenums li.L8,pre.prettyprint.linenums ol.linenums li.L9{list-style-type:decimal!important}pre.prettyprint{width:100%;border:0!important}.pln{color:#444!important}.kwd{color:#07a!important;font-weight:700}.pun{color:#999!important}.str{color:#2e7d32!important}pre.prettyprint{background-color:#f7f7f9!important;border:0 solid #333}.editormd-html-preview,.editormd-preview-container{padding:0}

resources/views/tree/container.blade.php

@@ -18,7 +18,7 @@
 
         @if($useRefresh)
             &nbsp;<div class="btn-group" style="margin-right:3px">
-                <button class="btn btn-primary btn-sm" data-action="refresh" ><i class="feather icon-refresh-cw"></i><span class="d-none d-sm-inline">&nbsp;{{ trans('admin.refresh') }}</span></button>
+                <button class="btn btn-outline-primary btn-sm" data-action="refresh" ><i class="feather icon-refresh-cw"></i><span class="d-none d-sm-inline">&nbsp;{{ trans('admin.refresh') }}</span></button>
             </div>
         @endif
 

src/Color.php

@@ -57,6 +57,8 @@ use Dcat\Admin\Support\Helper;
  */
 class Color
 {
+    const DEFAULT_COLOR = 'indigo';
+
     /**
      * 颜色.
      *
@@ -64,21 +66,26 @@ class Color
      */
     protected static $colors = [
         'indigo' => [
-            'css' => [],
             'colors' => [
                 'primary'        => 'indigo',
                 'primary-darker' => 'indigo-darker',
                 'link'           => 'indigo-darker',
             ],
         ],
-        'blue' => [
-            'css' => [],
+        'blue-light' => [
             'colors' => [
-                'primary'        => '#3d97dd',
+                'primary'        => '#4199de',
                 'primary-darker' => '#278bd9',
                 'link'           => '#278bd9',
             ],
         ],
+        'blue' => [
+            'colors' => [
+                'primary'        => '#5686d4',
+                'primary-darker' => '#4277cf',
+                'link'           => '#4277cf',
+            ],
+        ],
     ];
 
     /**
@@ -178,7 +185,7 @@ class Color
      */
     public function __construct($name = null)
     {
-        $this->name = ($name ?: config('admin.layout.color')) ?: 'indigo';
+        $this->name = ($name ?: config('admin.layout.color')) ?: static::DEFAULT_COLOR;
 
         $this->currentColors = array_merge(
             static::$default,
@@ -194,16 +201,6 @@ class Color
         return $this->name;
     }
 
-    /**
-     * 获取css文件路径.
-     *
-     * @return array
-     */
-    public function css()
-    {
-        return static::$colors[$this->name]['css'];
-    }
-
     /**
      * 获取颜色.
      *
@@ -303,16 +300,14 @@ class Color
     /**
      * 扩展颜色.
      *
-     * @param string       $name
-     * @param string|array $skinPath
-     * @param array        $colors
+     * @param string $name
+     * @param array  $colors
      *
      * @return void
      */
-    public static function extend(string $name, $skinPath, array $colors)
+    public static function extend(string $name, array $colors)
     {
         static::$colors[$name] = [
-            'css'    => array_filter((array) $skinPath),
             'colors' => $colors,
         ];
     }

src/Layout/Asset.php

@@ -2,6 +2,9 @@
 
 namespace Dcat\Admin\Layout;
 
+use Dcat\Admin\Admin;
+use Dcat\Admin\Color;
+
 class Asset
 {
     /**
@@ -253,6 +256,37 @@ class Asset
     public function __construct()
     {
         $this->isPjax = request()->pjax();
+
+        $this->initTheme();
+    }
+
+    /**
+     * 初始化主题样式.
+     */
+    protected function initTheme()
+    {
+        $color = Admin::color()->name();
+
+        if ($color === Color::DEFAULT_COLOR) {
+            return;
+        }
+
+        $alias = [
+            '@adminlte',
+            '@dcat',
+            '@webuploader',
+            '@smart-wizard',
+        ];
+
+        foreach ($alias as $n) {
+            $before = (array) $this->alias[$n]['css'];
+
+            $this->alias[$n]['css'] = [];
+
+            foreach ($before as $css) {
+                $this->alias[$n]['css'][] = str_replace('.css', "-{$color}.css", $css);
+            }
+        }
     }
 
     /**