调整样式

app/admin/view/config/index.html

@@ -12,7 +12,7 @@
 
 {block name="content"}
 <!--{notempty name='isSuper'}-->
-<div class="layui-card padding-20">
+<div class="layui-card padding-20 shadow">
     <div class="layui-card-header notselect">
         <b>运行模式</b><span class="color-desc font-s12 padding-left-5">Run Mode</span>
     </div>
@@ -33,7 +33,7 @@
     </div>
 </div>
 <!--{/notempty}-->
-<div class="layui-card padding-20">
+<div class="layui-card padding-20 shadow">
     <div class="layui-card-header notselect">
         <b>存储引擎</b><span class="color-desc font-s12 padding-left-5">Storage Engine</span>
     </div>
@@ -54,7 +54,7 @@
     </div>
 </div>
 
-<div class="layui-card padding-20">
+<div class="layui-card padding-20 shadow">
     <div class="layui-card-header notselect">
         <b>系统参数</b><span class="color-desc font-s12 padding-left-5">System Parameter</span>
     </div>
@@ -110,7 +110,7 @@
     </div>
 </div>
 
-<div class="layui-card padding-20">
+<div class="layui-card padding-20 shadow">
     <div class="layui-card-header notselect">
         <b>系统信息</b><span class="color-desc font-s12 padding-left-5">System Information</span>
     </div>

app/admin/view/index/index.html

@@ -23,7 +23,7 @@
     <!-- 顶部菜单 开始 -->
     <div class="layui-header notselect">
         <a href="{:url('@')}" class="layui-logo layui-elip">
-            {:sysconf('app_name')} {if sysconf('app_version')}<sup class="padding-left-5">{:sysconf('app_version')}</sup>{/if}
+            {:sysconf('app_name')} {if sysconf('app_version')}<sup>{:sysconf('app_version')}</sup>{/if}
         </a>
         <ul class="layui-nav layui-layout-left">
             <li class="layui-nav-item" lay-unselect>
@@ -45,17 +45,17 @@
             {if session('user.username')}
             <li class="layui-nav-item">
                 <dl class="layui-nav-child">
-                    <dd lay-unselect><a data-modal="{:url('admin/index/info',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-set-fill margin-right-5"></i> 基本资料</a></dd>
-                    <dd lay-unselect><a data-modal="{:url('admin/index/pass',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-component margin-right-5"></i> 安全设置</a></dd>
+                    <dd lay-unselect><a data-modal="{:url('admin/index/info',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-set-fill"></i> 基本资料</a></dd>
+                    <dd lay-unselect><a data-modal="{:url('admin/index/pass',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-component"></i> 安全设置</a></dd>
                     {if session('user.username') eq 'admin'}
-                    <dd lay-unselect><a data-load="{:url('admin/api.plugs/push')}"><i class="layui-icon layui-icon-template-1 margin-right-5"></i> 缓存加速</a></dd>
-                    <dd lay-unselect><a data-load="{:url('admin/api.plugs/clear')}"><i class="layui-icon layui-icon-fonts-clear margin-right-5"></i> 清理缓存</a></dd>
+                    <dd lay-unselect><a data-load="{:url('admin/api.plugs/push')}"><i class="layui-icon layui-icon-template-1"></i> 缓存加速</a></dd>
+                    <dd lay-unselect><a data-load="{:url('admin/api.plugs/clear')}"><i class="layui-icon layui-icon-fonts-clear"></i> 清理缓存</a></dd>
                     {/if}
-                    <dd lay-unselect><a data-load="{:url('admin/login/out')}" data-confirm="确定要退出登录吗？"><i class="layui-icon layui-icon-release margin-right-5"></i> 退出登录</a></dd>
+                    <dd lay-unselect><a data-load="{:url('admin/login/out')}" data-confirm="确定要退出登录吗？"><i class="layui-icon layui-icon-release"></i> 退出登录</a></dd>
                 </dl>
                 <a class="layui-elip">
                     <img alt="headimg" src="{:session('user.headimg')?:'__ROOT__/static/theme/img/headimg.png'}">
-                    <span class="padding-left-5">{:session('user.nickname')?:session('user.username')}</span>
+                    <span>{:session('user.nickname')?:session('user.username')}</span>
                 </a>
             </li>
             {else}
@@ -75,21 +75,21 @@
                 <li class="layui-nav-item">
                     <a data-target-tips="{$two.title}" data-menu-node="m-{$one.id}-{$two.id}" data-open="{$two.url}">
                         <span class='{$two.icon|default="layui-icon layui-icon-link"}'></span>
-                        <span class="nav-text padding-left-5">{$two.title|default=''}</span>
+                        <span class="nav-text">{$two.title|default=''}</span>
                     </a>
                 </li>
                 {else}
                 <li class="layui-nav-item" data-submenu-layout='m-{$one.id}-{$two.id}'>
                     <a data-target-tips="{$two.title}" style="background:#393D49">
                         <span class='nav-icon layui-hide {$two.icon|default="layui-icon layui-icon-triangle-d"}'></span>
-                        <span class="nav-text padding-left-5">{$two.title|default=''}</span>
+                        <span class="nav-text">{$two.title|default=''}</span>
                     </a>
                     <dl class="layui-nav-child">
                         {foreach $two.sub as $thr}
                         <dd>
                             <a data-target-tips="{$thr.title}" data-open="{$thr.url}" data-menu-node="m-{$one.id}-{$two.id}-{$thr.id}">
-                                <span class='nav-icon padding-left-5 {$thr.icon|default="layui-icon layui-icon-link"}'></span>
-                                <span class="nav-text padding-left-5">{$thr.title|default=''}</span>
+                                <span class='nav-icon {$thr.icon|default="layui-icon layui-icon-link"}'></span>
+                                <span class="nav-text">{$thr.title|default=''}</span>
                             </a>
                         </dd>
                         {/foreach}

app/admin/view/login/index.html

@@ -3,7 +3,7 @@
 {block name="body"}
 <div class="login-container" data-supersized="__ROOT__/static/theme/img/login/bg1.jpg,__ROOT__/static/theme/img/login/bg2.jpg">
     <div class="header notselect layui-hide-xs">
-        <a href="{:url('@')}" class="title">{:sysconf('app_name')}<span class="padding-left-5 font-s10">{:sysconf('app_version')}</span></a>
+        <a href="{:url('@')}" class="title">{:sysconf('app_name')}<span>{:sysconf('app_version')}</span></a>
         {notempty name='devmode'}
         <a class="pull-right layui-anim layui-anim-fadein" href='https://gitee.com/zoujingli/ThinkAdmin'>
             <img src='https://gitee.com/zoujingli/ThinkAdmin/widgets/widget_1.svg' alt='Fork me on Gitee'>
@@ -55,4 +55,4 @@
 {block name='script'}
 <script src="__ROOT__/static/login.js"></script>
 <script src="__ROOT__/static/plugs/supersized/supersized.3.2.7.min.js"></script>
-{/block}
+{/block}

app/wechat/view/news/form.html

@@ -100,7 +100,7 @@
             function apply(list) {
                 if (list.length < 1) list.push({
                     title: '新建图文', author: '管理员', content: '文章内容',
-                    read_num: 0, local_url: '__ROOT__/static/theme/img/image.png',
+                    read_num: 0, local_url: '__FULL__/static/theme/img/image.png',
                 });
                 for (var i in list) {
                     list[i].active = false;
@@ -173,8 +173,8 @@
                     author: '管理员',
                     content: '文章内容',
                     read_num: 0,
-                    local_url: '__ROOT__/static/theme/img/image.png',
-                    style: "background-image:url('__ROOT__/static/theme/img/image.png')"
+                    local_url: '__FULL__/static/theme/img/image.png',
+                    style: "background-image:url('__FULL__/static/theme/img/image.png')"
                 });
             };
             $rootScope.submit = function () {

config/view.php

@@ -16,7 +16,7 @@
 return [
     // 模板引擎类型使用 Think
     'type'               => 'Think',
-    // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
+    // 默认模板渲染规则 1.解析为小写+下划线 2.全部转换小写 3.保持操作方法
     'auto_rule'          => 1,
     // 模板目录名
     'view_dir_name'      => 'view',
@@ -40,6 +40,6 @@ return [
     'tpl_replace_string' => [
         '__APP__'  => rtrim(url('@')->build(), '\\/'),
         '__ROOT__' => rtrim(dirname(request()->basefile()), '\\/'),
-        '__HOST__' => rtrim(dirname(request()->basefile(true)), '\\/'),
+        '__FULL__' => rtrim(dirname(request()->basefile(true)), '\\/'),
     ],
 ];

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

@@ -79,7 +79,8 @@
 
     sup {
       font-size: 9px;
-      line-height: 9px
+      line-height: 9px;
+      padding-left: 5px;
     }
   }
 
@@ -102,7 +103,7 @@
       background: #eef;
       line-height: 45px;
 
-      + a {
+      + a.layui-elip {
         padding-right: 35px;
 
         img {
@@ -110,6 +111,10 @@
           height: 20px;
           border-radius: 50%
         }
+
+        span {
+          padding-left: 5px;
+        }
       }
 
       &.layui-show + a {
@@ -128,6 +133,10 @@
           color: #333;
           margin-top: 1px;
           text-align: center;
+
+          .layui-icon {
+            margin-right: 5px;
+          }
         }
       }
     }
@@ -168,6 +177,10 @@
         &:hover {
           background: hsla(0, 0%, 39%, .2) !important
         }
+
+        .nav-icon, .nav-text {
+          padding-left: 5px
+        }
       }
 
       &ed {

public/static/theme/css/login.less

@@ -42,6 +42,11 @@ body {
       line-height: 48px;
       text-indent: 40px;
       letter-spacing: 1px;
+
+      span {
+        font-size: 10px;
+        padding-left: 5px;
+      }
     }
 
     a {