增加更新样式

app/admin/controller/Config.php

@@ -35,10 +35,12 @@ class Config extends Controller
 {
     const themes = [
         'default' => '默认色',
-        'red'     => '玫瑰红',
+        'red-1'   => '玫瑰红1',
-        'blue'    => '天空蓝',
+        'blue-1'  => '天空蓝1',
-        'black'   => '精典黑',
+        'black-1' => '精典黑1',
-        'white'   => '简约白'
+        'white-1' => '简约白1',
+        'blue-2'  => '天空蓝2',
+        'green-2' => '小草绿2',
     ];
 
     /**

app/admin/view/index/layout-left.html

@@ -10,7 +10,8 @@
             {foreach $menus as $one}
             <div>
                 <a data-menu-node="m-{$one.id}" data-open="{$one.url}" data-target-tips="{$one.title|default=''}">
-                    <i class="{$one.icon|default='layui-icon layui-icon-ie'} font-s20"></i>
+                    <i class="{$one.icon|default='layui-icon layui-icon-ie'}"></i>
+                    <span>{$one.title|default=''}</span>
                 </a>
             </div>
             {/foreach}

public/static/theme/css/_layout_1.less

@@ -35,7 +35,6 @@
   .layui-side-scroll {
     display: flex !important;
     box-sizing: border-box;
-    border-right: @TopHeaderBottomLine;
 
     .layui-side-icon {
       display: none;

public/static/theme/css/_layout_1_black.less

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 @import "_config.less";
 
-.layui-layout-theme-black {
+.layui-layout-theme-black-1 {
   @mainActiveBack: #393D49 !important;
   @mainNormalBack: rgba(0, 0, 0, 0.1) !important;
 
@@ -21,5 +21,5 @@
   @leftNormalBackColor: @mainNormalBack;
   @leftActiveBackColor: #098 !important;
 
-  @import (multiple)"_layout_.less";
+  @import (multiple)"_layout_1.less";
 }

public/static/theme/css/_layout_1_blue.less

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 @import "_config.less";
 
-.layui-layout-theme-blue {
+.layui-layout-theme-blue-1 {
   @mainActiveBack: #1890FF !important;
   @mainNormalBack: rgba(0, 0, 0, 0.1) !important;
 
@@ -21,5 +21,5 @@
   @leftNormalBackColor: @mainNormalBack;
   @leftActiveBackColor: @mainActiveBack;
 
-  @import (multiple)"_layout_.less";
+  @import (multiple)"_layout_1.less";
 }

public/static/theme/css/_layout_1_red.less

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 @import "_config.less";
 
-.layui-layout-theme-red {
+.layui-layout-theme-red-1 {
   @mainActiveBack: #AA3130 !important;
   @mainNormalBack: rgba(0, 0, 0, 0.1) !important;
 
@@ -21,5 +21,5 @@
   @leftNormalBackColor: @mainNormalBack;
   @leftActiveBackColor: @mainActiveBack;
 
-  @import (multiple)"_layout_.less";
+  @import (multiple)"_layout_1.less";
 }

public/static/theme/css/_layout_2.less

@@ -0,0 +1,178 @@
+&.layui-layout-left-hide,
+&.layui-layout-left-mini {
+  .layui-side {
+    width: 260px;
+    z-index: 11;
+
+    .layui-logo {
+      .headimg {
+        margin-right: 10px !important;
+      }
+
+      .headtxt {
+        display: inline-block !important;
+      }
+    }
+
+    .layui-side-target {
+      left: @iconWidth;
+      margin-left: -12px;
+    }
+
+    .layui-side-scroll .layui-side-icon {
+      width: @iconWidth;
+      display: block;
+      background: #098;
+    }
+  }
+
+  > .layui-header {
+    left: 200px !important;
+  }
+
+  > .layui-body {
+    z-index: 11;
+    left: @iconWidth;
+
+    > .think-page-body > .layui-card > .layui-card-header {
+      left: @iconWidth;
+    }
+  }
+}
+
+> .layui-header {
+  left: 260px;
+  background-color: @mainColor;
+
+  .layui-layout-left {
+    .layui-nav-item {
+      display: none !important;
+    }
+  }
+
+  .layui-nav-item {
+    &.layui-this > a {
+      color: #fff !important;
+      font-weight: bold;
+    }
+
+    > a {
+      color: #eee !important;
+
+      &:hover {
+        color: #fff !important;
+        background: none !important;
+      }
+    }
+  }
+}
+
+> .layui-side {
+  width: 260px;
+  display: block !important;
+  background-color: @mainColor;
+
+  .layui-logo {
+    color: #fff;
+    box-shadow: none;
+    font-weight: bold;
+  }
+
+  .layui-side-scroll {
+    display: flex !important;
+    box-sizing: border-box;
+
+    .layui-nav-child {
+      background: none !important;
+    }
+
+    .layui-side-icon {
+      width: 100px;
+      display: block;
+      background: @mainColor;
+
+      a {
+        height: 60px;
+        display: block;
+        font-size: 14px;
+        text-align: center;
+        line-height: 60px;
+        white-space: nowrap;
+
+        &:hover {
+          background-color: rgba(0, 0, 0, 0.1);;
+        }
+
+        .layui-icon, span {
+          color: #fff;
+          overflow: hidden;
+          max-width: 4em;
+          margin-right: 5px;
+          text-overflow: ellipsis;
+          vertical-align: middle;
+          display: inline-block !important;
+        }
+      }
+
+      > .layui-this {
+        background: #fff;
+
+        a {
+          &:hover {
+            background-color: #fff;
+          }
+
+          .layui-icon, span {
+            color: @mainColor;
+          }
+        }
+      }
+    }
+
+    .layui-side-tree {
+      flex: 1;
+      background-color: #fff;
+
+      .layui-nav-item {
+        background: none !important;
+        border-bottom-color: #fff;
+
+        a {
+          color: #333 !important;
+          background: none !important;
+          border-bottom: none !important;
+
+          &:hover {
+            color: @mainColor;
+          }
+        }
+
+        .layui-this, &.layui-this {
+          > a {
+            color: @mainColor;
+            background: none !important;
+            font-weight: bold !important;
+
+            &:hover {
+              background: none !important;
+            }
+          }
+        }
+
+        &ed > a {
+          color: #999 !important;
+        }
+      }
+    }
+  }
+}
+
+> .layui-body {
+  left: 260px;
+
+  > .think-page-body > .layui-card > .layui-card-header {
+    left: 260px;
+    box-sizing: border-box;
+    border-bottom: unset;
+  }
+}

public/static/theme/css/_layout_2_blue.less

@@ -0,0 +1,10 @@
+@charset "UTF-8";
+@import "_config.less";
+
+.layui-layout-theme-blue-2 {
+
+  @iconWidth: 100px !important;
+  @mainColor: #467cd4 !important;
+
+  @import (multiple)"_layout_2.less";
+}

public/static/theme/css/_layout_2_green.less

@@ -0,0 +1,10 @@
+@charset "UTF-8";
+@import "_config.less";
+
+.layui-layout-theme-green-2 {
+
+  @iconWidth: 100px !important;
+  @mainColor: #098 !important;
+
+  @import (multiple)"_layout_2.less";
+}

public/static/theme/css/_layout_white.less

@@ -32,7 +32,7 @@
     }
   }
 
-  .layui-side {
+  > .layui-side {
     background-color: #fff !important;
 
     .layui-logo {

public/static/theme/css/console.less

@@ -66,7 +66,12 @@ body {
 @import '_custom.less';
 @import '_display.less';
 @import '_layout.less';
-@import '_layout_red.less';
+
-@import '_layout_blue.less';
+@import '_layout_1_red.less';
-@import '_layout_white.less';
+@import '_layout_1_blue.less';
-@import '_layout_black.less';
+@import '_layout_1_black.less';
+
+@import '_layout_2_green.less';
+@import '_layout_2_blue.less';
+
+@import '_layout_white.less';