修改后台LESS样式

app/admin/view/config/index.html

@@ -22,11 +22,11 @@
     <div class="layui-card-body nowrap">
         <div class="layui-btn-group">
             {if $app->isDebug()}
-            <a class="layui-btn layui-btn-sm border-right-0" data-tips-text="当前以开发模式运行中...">以开发模式运行</a>
+            <a class="layui-btn layui-btn-sm layui-btn-active" data-tips-text="当前以开发模式运行中...">以开发模式运行</a>
-            <a class="layui-btn layui-btn-sm layui-btn-primary border-left-0" data-tips-text="立即切换到生产模式运行" data-load="{:url('admin/api.plugs/debug')}?state=1">以生产模式运行</a>
+            <a class="layui-btn layui-btn-sm layui-btn-primary" data-tips-text="立即切换到生产模式运行" data-load="{:url('admin/api.plugs/debug')}?state=1">以生产模式运行</a>
             {else}
-            <a class="layui-btn layui-btn-sm layui-btn-primary border-right-0" data-tips-text="立即切换到开发模式运行" data-load="{:url('admin/api.plugs/debug')}?state=0">以开发模式运行</a>
+            <a class="layui-btn layui-btn-sm layui-btn-primary" data-tips-text="立即切换到开发模式运行" data-load="{:url('admin/api.plugs/debug')}?state=0">以开发模式运行</a>
-            <a class="layui-btn layui-btn-sm border-left-0" data-tips-text="当前以生产模式运行中...">以生产模式运行</a>
+            <a class="layui-btn layui-btn-sm layui-btn-active" data-tips-text="当前以生产模式运行中...">以生产模式运行</a>
             {/if}
         </div>
     </div>
@@ -40,7 +40,7 @@
     <div class="layui-card-body nowrap">
         <div class="layui-btn-group">
             {foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','alioss'=>'阿里云OSS存储'] as $k => $v} {if sysconf('storage.type') eq $k}
-            {if auth('storage')}<a data-title="配置{$v}" data-tips-text="切换并配置以{$v}文件" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm border-right-0">{$v}</a>{else}<a class="layui-btn layui-btn-sm border-right-0">{$v}</a>{/if}
+            {if auth('storage')}<a data-title="配置{$v}" data-tips-text="切换并配置以{$v}文件" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-active">{$v}</a>{else}<a class="layui-btn layui-btn-sm layui-btn-active">{$v}</a>{/if}
             {else}
             {if auth('storage')}<a data-title="配置{$v}" data-tips-text="切换并配置以{$v}文件" data-modal="{:url('storage')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{else}<a class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{/if}
             {/if}{/foreach}

public/static/theme/css/console.form.less

@@ -1,176 +0,0 @@
-fieldset {
-  margin: 0;
-  border: 1px solid #e6e6e6;
-  padding: 10px 20px 5px 20px;
-
-  legend {
-    color: #666;
-    padding: 0 10px;
-    font-size: 14px
-  }
-}
-
-.form-search {
-  .layui-btn {
-    height: 32px;
-    line-height: 28px;
-    font-size: 12px;
-    padding: 0 10px
-  }
-
-  .layui-form-label {
-    width: auto !important;
-    padding: 0 8px;
-    height: 32px;
-    line-height: 30px
-  }
-
-  .layui-input-inline {
-    width: 170px;
-
-    input, select {
-      width: 100%;
-      height: 32px;
-      padding: 2px 8px;
-      line-height: 1em
-    }
-  }
-
-  .layui-form-select dl {
-    top: 31px;
-    padding: 0
-  }
-}
-
-.layui-form {
-  input.layui-input, select.layui-select {
-    line-height: 1em;
-  }
-}
-
-/* 表单验证异常提示 */
-.label-required {
-  &-prev:before {
-    width: 1em;
-    color: red;
-    content: '*';
-    display: inline-block;
-    position: absolute;
-    text-align: left;
-    font-weight: 700;
-    line-height: 1.6em;
-    margin-left: -0.8em;
-  }
-
-  &:after, &-next:after {
-    top: 6px;
-    right: 5px;
-    color: red;
-    content: '*';
-    position: absolute;
-    margin-left: 4px;
-    font-weight: 700;
-    line-height: 1.8em
-  }
-
-  &-null:before {
-    content: none !important
-  }
-}
-
-/** 自定义表单样式 */
-.think-form-label {
-  padding: 9px 15px;
-  font-weight: 400;
-  line-height: 20px;
-  text-align: right
-}
-
-.think-form-group-right {
-  border-left: none;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.think-form-group-left input {
-  border-right: none;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.think-box-shadow {
-  padding: 20px !important;
-  background: #fff !important;
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .1);
-}
-
-/** checkbox & radio */
-label.think-checkbox, label.think-radio {
-  margin-right: 10px;
-  display: inline-block;
-}
-
-.think-checkbox, .think-radio {
-  cursor: pointer;
-  margin-top: 10px;
-  font-weight: 400;
-  line-height: 17px;
-}
-
-.think-checkbox input[type=checkbox] {
-  width: 18px;
-  height: 18px;
-  border: 1px solid #dcdcdc;
-  cursor: pointer;
-  margin: 0 5px 0 0;
-  position: relative;
-  display: inline-block !important;
-  background: #fff;
-  appearance: none;
-  box-sizing: border-box !important;
-  border-radius: 1px;
-  vertical-align: bottom;
-  -webkit-appearance: none;
-
-  &:checked:after {
-    color: #666;
-    padding: 2px;
-    display: block;
-    content: "\e605";
-    font-size: 12px;
-    font-style: normal;
-    font-weight: 700;
-    position: absolute;
-    font-family: layui-icon !important;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale
-  }
-}
-
-.think-radio input[type=radio] {
-  width: 18px;
-  height: 18px;
-  cursor: pointer;
-  margin: 0 5px 0 0;
-  position: relative;
-  border: 1px solid #dcdcdc;
-  display: inline-block !important;
-  box-sizing: border-box !important;
-  appearance: none;
-  background: #fff;
-  border-radius: 1em;
-  vertical-align: bottom;
-  -webkit-appearance: none;
-
-  &:checked:after {
-    top: 4px;
-    left: 4px;
-    width: 8px;
-    height: 8px;
-    content: '';
-    display: block;
-    position: relative;
-    background: #666;
-    border-radius: 1em
-  }
-}

public/static/theme/css/console.layout.less

@@ -238,3 +238,35 @@
   }
 }
 
+/* 下拉样式 */
+.layui-nav {
+  .layui-nav-item {
+    .layui-nav-more {
+      top: 0;
+      border: none;
+      right: 15px;
+      width: auto;
+      height: auto;
+      margin-top: 0;
+      font-size: 14px;
+      font-style: normal;
+      font-family: "layui-icon" !important;
+      -moz-osx-font-smoothing: grayscale;
+      -webkit-font-smoothing: antialiased;
+
+      &::before {
+        content: "\e619"
+      }
+    }
+
+    & .layui-nav-mored, &ed .layui-nav-more {
+      border: none;
+      margin-top: 0;
+      transform: rotate(180deg);
+      -o-transform: rotate(180deg);
+      -ms-transform: rotate(180deg);
+      -moz-transform: rotate(180deg);
+      -webkit-transform: rotate(180deg)
+    }
+  }
+}

public/static/theme/css/console.layui.less

@@ -1,7 +1,186 @@
-.layui-form.layui-card {
+fieldset {
-  box-shadow: none
+  margin: 0;
+  border: 1px solid #e6e6e6;
+  padding: 10px 20px 5px 20px;
+
+  legend {
+    color: #666;
+    padding: 0 10px;
+    font-size: 14px
+  }
 }
 
+/*! 搜索表单样式 */
+.form-search {
+  .layui-btn {
+    height: 32px;
+    line-height: 28px;
+    font-size: 12px;
+    padding: 0 10px
+  }
+
+  .layui-form-label {
+    width: auto !important;
+    height: 32px;
+    padding: 0 8px;
+    line-height: 30px
+  }
+
+  .layui-input-inline {
+    width: 170px;
+
+    input, select {
+      width: 100%;
+      height: 32px;
+      padding: 2px 8px;
+      line-height: 1em
+    }
+  }
+
+  .layui-form-select dl {
+    top: 31px;
+    padding: 0
+  }
+}
+
+.layui-form {
+  input.layui-input, select.layui-select {
+    line-height: 1em;
+  }
+
+  &.layui-card {
+    box-shadow: none
+  }
+}
+
+/* 表单验证异常提示 */
+.label-required {
+  &-prev:before {
+    width: 1em;
+    color: red;
+    content: '*';
+    display: inline-block;
+    position: absolute;
+    text-align: left;
+    font-weight: 700;
+    line-height: 1.6em;
+    margin-left: -0.8em;
+  }
+
+  &:after, &-next:after {
+    top: 6px;
+    right: 5px;
+    color: red;
+    content: '*';
+    position: absolute;
+    margin-left: 4px;
+    font-weight: 700;
+    line-height: 1.8em
+  }
+
+  &-null:before {
+    content: none !important
+  }
+}
+
+/** 自定义表单样式 */
+.think-form-label {
+  padding: 9px 15px;
+  font-weight: 400;
+  line-height: 20px;
+  text-align: right
+}
+
+.think-form-group-right {
+  border-left: none;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.think-form-group-left input {
+  border-right: none;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.think-box-shadow {
+  padding: 20px !important;
+  background: #fff !important;
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .1);
+}
+
+/** checkbox & radio */
+label.think-checkbox, label.think-radio {
+  margin-right: 10px;
+  display: inline-block;
+}
+
+.think-checkbox, .think-radio {
+  cursor: pointer;
+  margin-top: 10px;
+  font-weight: 400;
+  line-height: 17px;
+}
+
+.think-checkbox input[type=checkbox] {
+  width: 18px;
+  height: 18px;
+  border: 1px solid #dcdcdc;
+  cursor: pointer;
+  margin: 0 5px 0 0;
+  position: relative;
+  display: inline-block !important;
+  background: #fff;
+  appearance: none;
+  box-sizing: border-box !important;
+  border-radius: 1px;
+  vertical-align: bottom;
+  -webkit-appearance: none;
+
+  &:checked:after {
+    color: #666;
+    padding: 2px;
+    display: block;
+    content: "\e605";
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 700;
+    position: absolute;
+    font-family: layui-icon !important;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale
+  }
+}
+
+.think-radio input[type=radio] {
+  width: 18px;
+  height: 18px;
+  cursor: pointer;
+  margin: 0 5px 0 0;
+  position: relative;
+  border: 1px solid #dcdcdc;
+  display: inline-block !important;
+  box-sizing: border-box !important;
+  appearance: none;
+  background: #fff;
+  border-radius: 1em;
+  vertical-align: bottom;
+  -webkit-appearance: none;
+
+  &:checked:after {
+    top: 4px;
+    left: 4px;
+    width: 8px;
+    height: 8px;
+    content: '';
+    display: block;
+    position: relative;
+    background: #666;
+    border-radius: 1em
+  }
+}
+
+
 .layui-layer-content .layui-form.layui-card .layui-card-body {
   padding: 30px 40px 0 0
 }
@@ -15,11 +194,32 @@
   line-height: 24px !important
 }
 
-/** Layui样式调整 */
+/** Layui 样式调整 */
 .layui-input, .layui-select {
   line-height: 38px
 }
 
+.layui-btn-group {
+  > .layui-btn {
+    border-right: 0 !important;
+    border-radius: 0 !important;
+    border-left: 1px solid #C9C9C9 !important;
+
+    &:last-child {
+      border-right: 1px solid #C9C9C9 !important;
+    }
+
+    &.layui-btn-active {
+      border-left: 0 !important;
+      border-right: 0 !important;
+
+      + .layui-btn {
+        border-left: 0 !important;
+      }
+    }
+  }
+}
+
 .layui-btn-primary {
   &.layui-btn-xs {
     line-height: 20px
@@ -30,39 +230,6 @@
   }
 }
 
-/* 下拉样式 */
-.layui-nav {
-  .layui-nav-item {
-    .layui-nav-more {
-      top: 0;
-      border: none;
-      right: 15px;
-      width: auto;
-      height: auto;
-      margin-top: 0;
-      font-size: 14px;
-      font-style: normal;
-      font-family: "layui-icon" !important;
-      -moz-osx-font-smoothing: grayscale;
-      -webkit-font-smoothing: antialiased;
-
-      &::before {
-        content: "\e619"
-      }
-    }
-
-    & .layui-nav-mored, &ed .layui-nav-more {
-      border: none;
-      margin-top: 0;
-      transform: rotate(180deg);
-      -o-transform: rotate(180deg);
-      -ms-transform: rotate(180deg);
-      -moz-transform: rotate(180deg);
-      -webkit-transform: rotate(180deg)
-    }
-  }
-}
-
 .layui-table {
 
   td, th {

public/static/theme/css/console.less

@@ -79,5 +79,4 @@ body {
 
 @import "console.custom.less";
 @import 'console.layout.less';
-@import "console.layui.less";
+@import "console.layui.less";
-@import "console.form.less";