郭文星 / gssb_xp_yn_cn · 提交

转到一个项目

作者 郭文星
提交 7a58e1b54a603ff34f0568e125ea730764d57ec2 1 个父辈 f0d93004

123

内嵌 并排对比
正在显示 5 个修改的文件 包含 100 行增加 和 99 行删除
@@ -3,8 +3,7 @@ @@ -3,8 +3,7 @@
3 <!-- 迷你模式下Logo的大小为50X50 --> 3 <!-- 迷你模式下Logo的大小为50X50 -->
4 <span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'|htmlentities}</span> 4 <span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'|htmlentities}</span>
5 <!-- 普通模式下Logo --> 5 <!-- 普通模式下Logo -->
6 - <span class="logo-lg">{$site.name|htmlentities}</span>  
7 -</a> 6 + <span class="logo-lg">{$site.name|htmlentities}</span></a>
8 7
9 <!-- 顶部通栏样式 --> 8 <!-- 顶部通栏样式 -->
10 <nav class="navbar navbar-static-top"> 9 <nav class="navbar navbar-static-top">
@@ -24,10 +23,6 @@ @@ -24,10 +23,6 @@
24 <div class="navbar-custom-menu"> 23 <div class="navbar-custom-menu">
25 <ul class="nav navbar-nav"> 24 <ul class="nav navbar-nav">
26 25
27 - <li class="hidden-xs">  
28 - <a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>  
29 - </li>  
30 -  
31 <!-- 清除缓存 --> 26 <!-- 清除缓存 -->
32 <li class="hidden-xs"> 27 <li class="hidden-xs">
33 <a href="javascript:;" data-toggle="dropdown" title="{:__('Wipe cache')}"> 28 <a href="javascript:;" data-toggle="dropdown" title="{:__('Wipe cache')}">
@@ -73,41 +68,39 @@ @@ -73,41 +68,39 @@
73 </a> 68 </a>
74 <ul class="dropdown-menu"> 69 <ul class="dropdown-menu">
75 <!-- User image --> 70 <!-- User image -->
76 - <li class="user-header">  
77 - <img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt=""> 71 + <!-- <li class="user-header">-->
  72 + <!-- <img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt="">-->
78 73
79 - <p>  
80 - {$admin.nickname|htmlentities}  
81 - <small>{$admin.logintime|date="Y-m-d H:i:s",###}</small>  
82 - </p>  
83 - </li>  
84 - <li class="user-body">  
85 - <div class="visible-xs">  
86 - <div class="pull-left">  
87 - <a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>  
88 - </div>  
89 - <div class="pull-right">  
90 - <a href="javascript:;" data-type="all" class="wipecache"><i class="fa fa-trash fa-fw"></i> {:__('Wipe all cache')}</a>  
91 - </div>  
92 - </div>  
93 - </li> 74 + <!-- <p>-->
  75 + <!-- {$admin.nickname|htmlentities}-->
  76 + <!-- <small>{$admin.logintime|date="Y-m-d H:i:s",###}</small>-->
  77 + <!-- </p>-->
  78 + <!-- </li>-->
  79 + <!-- <li class="user-body">-->
  80 + <!-- <div class="visible-xs">-->
  81 + <!-- <div class="pull-left">-->
  82 + <!-- <a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>-->
  83 + <!-- </div>-->
  84 + <!-- <div class="pull-right">-->
  85 + <!-- <a href="javascript:;" data-type="all" class="wipecache"><i class="fa fa-trash fa-fw"></i> {:__('Wipe all cache')}</a>-->
  86 + <!-- </div>-->
  87 + <!-- </div>-->
  88 + <!-- </li>-->
94 <!-- Menu Footer--> 89 <!-- Menu Footer-->
95 - <li class="user-footer">  
96 - <div class="pull-left">  
97 - <a href="general/profile" class="btn btn-primary addtabsit"><i class="fa fa-user"></i>  
98 - {:__('Profile')}</a>  
99 - </div>  
100 - <div class="pull-right">  
101 - <a href="{:url('index/logout')}" class="btn btn-danger"><i class="fa fa-sign-out"></i>  
102 - {:__('Logout')}</a>  
103 - </div> 90 + <li>
  91 + <a href="general/profile" class="addtabsit"><i class="fa fa-user"></i>
  92 + {:__('Profile')}</a>
  93 + </li>
  94 + <li>
  95 + <a href="{:url('index/logout')}"><i class="fa fa-sign-out"></i>
  96 + {:__('Logout')}</a>
104 </li> 97 </li>
105 </ul> 98 </ul>
106 </li> 99 </li>
107 <!-- 控制栏切换按钮 --> 100 <!-- 控制栏切换按钮 -->
108 - <li class="hidden-xs">  
109 - <a href="javascript:;" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>  
110 - </li> 101 + <!-- <li class="hidden-xs">-->
  102 + <!-- <a href="javascript:;" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>-->
  103 + <!-- </li>-->
111 </ul> 104 </ul>
112 </div> 105 </div>
113 </div> 106 </div>
1 <!-- 左侧菜单栏 --> 1 <!-- 左侧菜单栏 -->
2 <section class="sidebar"> 2 <section class="sidebar">
3 <!-- 管理员信息 --> 3 <!-- 管理员信息 -->
4 - <div class="user-panel hidden-xs">  
5 - <div class="pull-left image">  
6 - <a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>  
7 - </div>  
8 - <div class="pull-left info">  
9 - <p>{$admin.nickname|htmlentities}</p>  
10 - <i class="fa fa-circle text-success"></i> {:__('Online')}  
11 - </div>  
12 - </div> 4 + <!-- <div class="user-panel hidden-xs">-->
  5 + <!-- <div class="pull-left image">-->
  6 + <!-- <a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>-->
  7 + <!-- </div>-->
  8 + <!-- <div class="pull-left info">-->
  9 + <!-- <p>{$admin.nickname|htmlentities}</p>-->
  10 + <!-- <i class="fa fa-circle text-success"></i> {:__('Online')}-->
  11 + <!-- </div>-->
  12 + <!-- </div>-->
  13 +
13 14
14 <!-- 菜单搜索 --> 15 <!-- 菜单搜索 -->
15 - <form action="" method="get" class="sidebar-form" onsubmit="return false;">  
16 - <div class="input-group">  
17 - <input type="text" name="q" class="form-control" placeholder="{:__('Search menu')}">  
18 - <span class="input-group-btn">  
19 - <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>  
20 - </button>  
21 - </span>  
22 - <div class="menuresult list-group sidebar-form hide">  
23 - </div>  
24 - </div>  
25 - </form> 16 + <!-- <form action="" method="get" class="sidebar-form" onsubmit="return false;">-->
  17 + <!-- <div class="input-group">-->
  18 + <!-- <input type="text" name="q" class="form-control" placeholder="{:__('Search menu')}">-->
  19 + <!-- <span class="input-group-btn">-->
  20 + <!-- <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>-->
  21 + <!-- </button>-->
  22 + <!-- </span>-->
  23 + <!-- <div class="menuresult list-group sidebar-form hide">-->
  24 + <!-- </div>-->
  25 + <!-- </div>-->
  26 + <!-- </form>-->
26 27
27 <!-- 移动端一级菜单 --> 28 <!-- 移动端一级菜单 -->
28 <div class="mobilenav visible-xs"> 29 <div class="mobilenav visible-xs">
@@ -36,4 +37,5 @@ @@ -36,4 +37,5 @@
36 {$menulist} 37 {$menulist}
37 38
38 </ul> 39 </ul>
  40 +
39 </section> 41 </section>
@@ -18,7 +18,7 @@ return [ @@ -18,7 +18,7 @@ return [
18 // 应用命名空间 18 // 应用命名空间
19 'app_namespace' => 'app', 19 'app_namespace' => 'app',
20 // 应用调试模式 20 // 应用调试模式
21 - 'app_debug' => Env::get('app.debug', false), 21 + 'app_debug' => Env::get('app.debug', true),
22 // 应用Trace 22 // 应用Trace
23 'app_trace' => Env::get('app.trace', false), 23 'app_trace' => Env::get('app.trace', false),
24 // 应用模式状态 24 // 应用模式状态
@@ -272,7 +272,7 @@ return [ @@ -272,7 +272,7 @@ return [
272 //会员注册验证码类型email/mobile/wechat/text/false 272 //会员注册验证码类型email/mobile/wechat/text/false
273 'user_register_captcha' => 'text', 273 'user_register_captcha' => 'text',
274 //登录验证码 274 //登录验证码
275 - 'login_captcha' => true, 275 + 'login_captcha' => false,
276 //登录失败超过10次则1天后重试 276 //登录失败超过10次则1天后重试
277 'login_failure_retry' => true, 277 'login_failure_retry' => true,
278 //是否同一账号同一时间只能在一个地方登录 278 //是否同一账号同一时间只能在一个地方登录
@@ -1334,7 +1334,7 @@ a.text-primary:focus { @@ -1334,7 +1334,7 @@ a.text-primary:focus {
1334 color: #30364a; 1334 color: #30364a;
1335 } 1335 }
1336 .text-success { 1336 .text-success {
1337 - color: #18bc9c; 1337 + color: #007AFF;
1338 } 1338 }
1339 a.text-success:hover, 1339 a.text-success:hover,
1340 a.text-success:focus { 1340 a.text-success:focus {
@@ -3104,19 +3104,19 @@ fieldset[disabled] .btn-default.focus { @@ -3104,19 +3104,19 @@ fieldset[disabled] .btn-default.focus {
3104 } 3104 }
3105 .btn-primary { 3105 .btn-primary {
3106 color: #fff; 3106 color: #fff;
3107 - background-color: #444c69;  
3108 - border-color: #444c69; 3107 + background-color: #007bff;
  3108 + border-color: #007bff;
3109 } 3109 }
3110 .btn-primary:focus, 3110 .btn-primary:focus,
3111 .btn-primary.focus { 3111 .btn-primary.focus {
3112 color: #fff; 3112 color: #fff;
3113 - background-color: #30364a;  
3114 - border-color: #12141c; 3113 + background-color: #007bff;
  3114 + border-color: #007bff;
3115 } 3115 }
3116 .btn-primary:hover { 3116 .btn-primary:hover {
3117 color: #fff; 3117 color: #fff;
3118 - background-color: #30364a;  
3119 - border-color: #2c3144; 3118 + background-color: #007bff;
  3119 + border-color: #007bff;
3120 } 3120 }
3121 .btn-primary:active, 3121 .btn-primary:active,
3122 .btn-primary.active, 3122 .btn-primary.active,
@@ -3135,8 +3135,8 @@ fieldset[disabled] .btn-default.focus { @@ -3135,8 +3135,8 @@ fieldset[disabled] .btn-default.focus {
3135 .btn-primary.active.focus, 3135 .btn-primary.active.focus,
3136 .open > .dropdown-toggle.btn-primary.focus { 3136 .open > .dropdown-toggle.btn-primary.focus {
3137 color: #fff; 3137 color: #fff;
3138 - background-color: #222634;  
3139 - border-color: #12141c; 3138 + background-color: #007bff;
  3139 + border-color: #007bff;
3140 } 3140 }
3141 .btn-primary:active, 3141 .btn-primary:active,
3142 .btn-primary.active, 3142 .btn-primary.active,
@@ -3152,8 +3152,8 @@ fieldset[disabled] .btn-primary:focus, @@ -3152,8 +3152,8 @@ fieldset[disabled] .btn-primary:focus,
3152 .btn-primary.disabled.focus, 3152 .btn-primary.disabled.focus,
3153 .btn-primary[disabled].focus, 3153 .btn-primary[disabled].focus,
3154 fieldset[disabled] .btn-primary.focus { 3154 fieldset[disabled] .btn-primary.focus {
3155 - background-color: #444c69;  
3156 - border-color: #444c69; 3155 + background-color: #007bff;
  3156 + border-color: #007bff;
3157 } 3157 }
3158 .btn-primary .badge { 3158 .btn-primary .badge {
3159 color: #444c69; 3159 color: #444c69;
@@ -3161,26 +3161,26 @@ fieldset[disabled] .btn-primary.focus { @@ -3161,26 +3161,26 @@ fieldset[disabled] .btn-primary.focus {
3161 } 3161 }
3162 .btn-success { 3162 .btn-success {
3163 color: #fff; 3163 color: #fff;
3164 - background-color: #18bc9c;  
3165 - border-color: #18bc9c; 3164 + background-color: #1F78FF;
  3165 + border-color: #1F78FF;
3166 } 3166 }
3167 .btn-success:focus, 3167 .btn-success:focus,
3168 .btn-success.focus { 3168 .btn-success.focus {
3169 color: #fff; 3169 color: #fff;
3170 - background-color: #128f76;  
3171 - border-color: #0a4b3e; 3170 + background-color: #007AFF;
  3171 + border-color: #002e5e;
3172 } 3172 }
3173 .btn-success:hover { 3173 .btn-success:hover {
3174 color: #fff; 3174 color: #fff;
3175 - background-color: #128f76;  
3176 - border-color: #11866f; 3175 + background-color: #007AFF;
  3176 + border-color: #007AFF;
3177 } 3177 }
3178 .btn-success:active, 3178 .btn-success:active,
3179 .btn-success.active, 3179 .btn-success.active,
3180 .open > .dropdown-toggle.btn-success { 3180 .open > .dropdown-toggle.btn-success {
3181 color: #fff; 3181 color: #fff;
3182 - background-color: #128f76;  
3183 - border-color: #11866f; 3182 + background-color: #007AFF;
  3183 + border-color: #007AFF;
3184 } 3184 }
3185 .btn-success:active:hover, 3185 .btn-success:active:hover,
3186 .btn-success.active:hover, 3186 .btn-success.active:hover,
@@ -3555,7 +3555,7 @@ tbody.collapse.in { @@ -3555,7 +3555,7 @@ tbody.collapse.in {
3555 color: #fff; 3555 color: #fff;
3556 text-decoration: none; 3556 text-decoration: none;
3557 outline: 0; 3557 outline: 0;
3558 - background-color: #444c69; 3558 + background-color: #007AFF;
3559 } 3559 }
3560 .dropdown-menu > .disabled > a, 3560 .dropdown-menu > .disabled > a,
3561 .dropdown-menu > .disabled > a:hover, 3561 .dropdown-menu > .disabled > a:hover,
@@ -4739,8 +4739,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { @@ -4739,8 +4739,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
4739 .pagination > .active > span:focus { 4739 .pagination > .active > span:focus {
4740 z-index: 3; 4740 z-index: 3;
4741 color: #fff; 4741 color: #fff;
4742 - background-color: #444c69;  
4743 - border-color: #444c69; 4742 + background-color: #007AFF;
  4743 + border-color: #007AFF;
4744 cursor: default; 4744 cursor: default;
4745 } 4745 }
4746 .pagination > .disabled > span, 4746 .pagination > .disabled > span,
@@ -6724,4 +6724,4 @@ button.close { @@ -6724,4 +6724,4 @@ button.close {
6724 display: none !important; 6724 display: none !important;
6725 } 6725 }
6726 } 6726 }
6727 -/*# sourceMappingURL=bootstrap.css.map */  
  6727 +/*# sourceMappingURL=bootstrap.css.map */
@@ -23,16 +23,16 @@ @@ -23,16 +23,16 @@
23 .skin-blue .main-header .navbar .nav .open > a:focus, 23 .skin-blue .main-header .navbar .nav .open > a:focus,
24 .skin-blue .main-header .navbar .nav > .active > a { 24 .skin-blue .main-header .navbar .nav > .active > a {
25 background: rgba(0, 0, 0, 0.02); 25 background: rgba(0, 0, 0, 0.02);
26 - color: #4e73df; 26 + color: #007AFF;
27 } 27 }
28 .skin-blue .main-header .navbar .nav-addtabs li > .close-tab { 28 .skin-blue .main-header .navbar .nav-addtabs li > .close-tab {
29 - color: #4e73df; 29 + color: #007AFF;
30 } 30 }
31 .skin-blue .main-header .navbar .sidebar-toggle { 31 .skin-blue .main-header .navbar .sidebar-toggle {
32 color: #444; 32 color: #444;
33 } 33 }
34 .skin-blue .main-header .navbar .sidebar-toggle:hover { 34 .skin-blue .main-header .navbar .sidebar-toggle:hover {
35 - color: #4e73df; 35 + color: #007AFF;
36 background: rgba(0, 0, 0, 0.02); 36 background: rgba(0, 0, 0, 0.02);
37 } 37 }
38 .skin-blue .main-header .navbar > .sidebar-toggle { 38 .skin-blue .main-header .navbar > .sidebar-toggle {
@@ -49,14 +49,15 @@ @@ -49,14 +49,15 @@
49 border-right-width: 0; 49 border-right-width: 0;
50 } 50 }
51 .skin-blue .main-header > .logo { 51 .skin-blue .main-header > .logo {
52 - background-color: #4e73df;  
53 - color: #fff; 52 + background-color: #fff;
  53 + color: #144496;
  54 + font-weight: bold;
54 border-bottom: 0 solid transparent; 55 border-bottom: 0 solid transparent;
55 - border-right: 1px solid #4e73df; 56 + border-right: 1px solid #fff;
56 box-shadow: none; 57 box-shadow: none;
57 } 58 }
58 .skin-blue .main-header > .logo:hover { 59 .skin-blue .main-header > .logo:hover {
59 - background-color: #4a70de; 60 + background-color: #fff;
60 } 61 }
61 @media (max-width: 767px) { 62 @media (max-width: 767px) {
62 .skin-blue .main-header > .logo { 63 .skin-blue .main-header > .logo {
@@ -70,7 +71,7 @@ @@ -70,7 +71,7 @@
70 } 71 }
71 } 72 }
72 .skin-blue .main-header li.user-header { 73 .skin-blue .main-header li.user-header {
73 - background-color: #4e73df; 74 + background-color: #007AFF;
74 } 75 }
75 .skin-blue .main-header .nav-addtabs > li > a, 76 .skin-blue .main-header .nav-addtabs > li > a,
76 .skin-blue .main-header .nav-addtabs > li.active > a { 77 .skin-blue .main-header .nav-addtabs > li.active > a {
@@ -83,7 +84,7 @@ @@ -83,7 +84,7 @@
83 .skin-blue .wrapper, 84 .skin-blue .wrapper,
84 .skin-blue .main-sidebar, 85 .skin-blue .main-sidebar,
85 .skin-blue .left-side { 86 .skin-blue .left-side {
86 - background-color: #4e73df; 87 + background-color: #fff;
87 } 88 }
88 .skin-blue .user-panel > .info, 89 .skin-blue .user-panel > .info,
89 .skin-blue .user-panel > .info > a { 90 .skin-blue .user-panel > .info > a {
@@ -98,25 +99,29 @@ @@ -98,25 +99,29 @@
98 } 99 }
99 .skin-blue .sidebar-menu > li:hover > a, 100 .skin-blue .sidebar-menu > li:hover > a,
100 .skin-blue .sidebar-menu > li.active > a { 101 .skin-blue .sidebar-menu > li.active > a {
101 - color: #fff;  
102 - background: #456cdd; 102 + color: #007AFF;
  103 + background: #f6fcff;
103 border-left-color: #fff; 104 border-left-color: #fff;
104 } 105 }
105 .skin-blue .sidebar-menu > li > .treeview-menu { 106 .skin-blue .sidebar-menu > li > .treeview-menu {
106 - background: #4169dd; 107 + background: #fff;
107 } 108 }
108 .skin-blue .sidebar a { 109 .skin-blue .sidebar a {
109 - color: #ccd9ff; 110 + color: #293452;
110 } 111 }
111 .skin-blue .sidebar a:hover { 112 .skin-blue .sidebar a:hover {
112 text-decoration: none; 113 text-decoration: none;
113 } 114 }
114 -.skin-blue .treeview-menu > li > a {  
115 - color: #ccd9ff; 115 +.sidebar-mini.sidebar-collapse .sidebar-menu .treeview > a > .treeview-menu ,
  116 +.sidebar-mini.sidebar-collapse .sidebar-menu > .treeview > a > span:first-of-type ,
  117 +.sidebar-mini.sidebar-collapse .sidebar-menu .active > a > span:first-of-type
  118 +{
  119 + -webkit-box-shadow: 8px 4px 8px 0 #000d6114;
  120 + box-shadow: 8px 4px 8px 0 #000d6114;
116 } 121 }
117 .skin-blue .treeview-menu > li.active > a, 122 .skin-blue .treeview-menu > li.active > a,
118 .skin-blue .treeview-menu > li > a:hover { 123 .skin-blue .treeview-menu > li > a:hover {
119 - color: #fff; 124 + color: #007AFF;
120 } 125 }
121 .skin-blue .sidebar-form { 126 .skin-blue .sidebar-form {
122 border-radius: 3px; 127 border-radius: 3px;
@@ -183,9 +188,10 @@ @@ -183,9 +188,10 @@
183 .skin-blue .sidebar-form .btn { 188 .skin-blue .sidebar-form .btn {
184 color: #fff; 189 color: #fff;
185 } 190 }
  191 +
186 @media (max-width: 767px) { 192 @media (max-width: 767px) {
187 .skin-blue.multiplenav .main-header .navbar { 193 .skin-blue.multiplenav .main-header .navbar {
188 - background-color: #4e73df; 194 + background-color: #007AFF;
189 } 195 }
190 .skin-blue.multiplenav .main-header .navbar .nav > li > a { 196 .skin-blue.multiplenav .main-header .navbar .nav > li > a {
191 color: #fff; 197 color: #fff;
@@ -211,7 +217,7 @@ @@ -211,7 +217,7 @@
211 background: rgba(0, 0, 0, 0.1); 217 background: rgba(0, 0, 0, 0.1);
212 } 218 }
213 .skin-blue.multiplenav .main-header > .logo { 219 .skin-blue.multiplenav .main-header > .logo {
214 - background-color: #4e73df; 220 + background-color: #007AFF;
215 color: #fff; 221 color: #fff;
216 border-bottom: 0 solid transparent; 222 border-bottom: 0 solid transparent;
217 } 223 }
@@ -227,4 +233,4 @@ @@ -227,4 +233,4 @@
227 color: #7995e7; 233 color: #7995e7;
228 } 234 }
229 } 235 }
230 -/*# sourceMappingURL=skin-blue.css.map */  
  236 +/*# sourceMappingURL=skin-blue.css.map */