郭文星 / gssb_xp_yn_cn · 提交

转到一个项目

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

123

内嵌 并排对比
正在显示 5 个修改的文件 包含 100 行增加 和 99 行删除
... ... @@ -3,8 +3,7 @@
<!-- 迷你模式下Logo的大小为50X50 -->
<span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'|htmlentities}</span>
<!-- 普通模式下Logo -->
<span class="logo-lg">{$site.name|htmlentities}</span>
</a>
<span class="logo-lg">{$site.name|htmlentities}</span></a>
<!-- 顶部通栏样式 -->
<nav class="navbar navbar-static-top">
... ... @@ -24,10 +23,6 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li class="hidden-xs">
<a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>
</li>
<!-- 清除缓存 -->
<li class="hidden-xs">
<a href="javascript:;" data-toggle="dropdown" title="{:__('Wipe cache')}">
... ... @@ -73,41 +68,39 @@
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
<img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt="">
<!-- <li class="user-header">-->
<!-- <img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt="">-->
<p>
{$admin.nickname|htmlentities}
<small>{$admin.logintime|date="Y-m-d H:i:s",###}</small>
</p>
</li>
<li class="user-body">
<div class="visible-xs">
<div class="pull-left">
<a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>
</div>
<div class="pull-right">
<a href="javascript:;" data-type="all" class="wipecache"><i class="fa fa-trash fa-fw"></i> {:__('Wipe all cache')}</a>
</div>
</div>
</li>
<!-- <p>-->
<!-- {$admin.nickname|htmlentities}-->
<!-- <small>{$admin.logintime|date="Y-m-d H:i:s",###}</small>-->
<!-- </p>-->
<!-- </li>-->
<!-- <li class="user-body">-->
<!-- <div class="visible-xs">-->
<!-- <div class="pull-left">-->
<!-- <a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>-->
<!-- </div>-->
<!-- <div class="pull-right">-->
<!-- <a href="javascript:;" data-type="all" class="wipecache"><i class="fa fa-trash fa-fw"></i> {:__('Wipe all cache')}</a>-->
<!-- </div>-->
<!-- </div>-->
<!-- </li>-->
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="general/profile" class="btn btn-primary addtabsit"><i class="fa fa-user"></i>
{:__('Profile')}</a>
</div>
<div class="pull-right">
<a href="{:url('index/logout')}" class="btn btn-danger"><i class="fa fa-sign-out"></i>
{:__('Logout')}</a>
</div>
<li>
<a href="general/profile" class="addtabsit"><i class="fa fa-user"></i>
{:__('Profile')}</a>
</li>
<li>
<a href="{:url('index/logout')}"><i class="fa fa-sign-out"></i>
{:__('Logout')}</a>
</li>
</ul>
</li>
<!-- 控制栏切换按钮 -->
<li class="hidden-xs">
<a href="javascript:;" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
</li>
<!-- <li class="hidden-xs">-->
<!-- <a href="javascript:;" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>-->
<!-- </li>-->
</ul>
</div>
</div>
... ...
<!-- 左侧菜单栏 -->
<section class="sidebar">
<!-- 管理员信息 -->
<div class="user-panel hidden-xs">
<div class="pull-left image">
<a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>
</div>
<div class="pull-left info">
<p>{$admin.nickname|htmlentities}</p>
<i class="fa fa-circle text-success"></i> {:__('Online')}
</div>
</div>
<!-- <div class="user-panel hidden-xs">-->
<!-- <div class="pull-left image">-->
<!-- <a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>-->
<!-- </div>-->
<!-- <div class="pull-left info">-->
<!-- <p>{$admin.nickname|htmlentities}</p>-->
<!-- <i class="fa fa-circle text-success"></i> {:__('Online')}-->
<!-- </div>-->
<!-- </div>-->
<!-- 菜单搜索 -->
<form action="" method="get" class="sidebar-form" onsubmit="return false;">
<div class="input-group">
<input type="text" name="q" class="form-control" placeholder="{:__('Search menu')}">
<span class="input-group-btn">
<button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>
</button>
</span>
<div class="menuresult list-group sidebar-form hide">
</div>
</div>
</form>
<!-- <form action="" method="get" class="sidebar-form" onsubmit="return false;">-->
<!-- <div class="input-group">-->
<!-- <input type="text" name="q" class="form-control" placeholder="{:__('Search menu')}">-->
<!-- <span class="input-group-btn">-->
<!-- <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>-->
<!-- </button>-->
<!-- </span>-->
<!-- <div class="menuresult list-group sidebar-form hide">-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<!-- 移动端一级菜单 -->
<div class="mobilenav visible-xs">
... ... @@ -36,4 +37,5 @@
{$menulist}
</ul>
</section>
... ...
... ... @@ -18,7 +18,7 @@ return [
// 应用命名空间
'app_namespace' => 'app',
// 应用调试模式
'app_debug' => Env::get('app.debug', false),
'app_debug' => Env::get('app.debug', true),
// 应用Trace
'app_trace' => Env::get('app.trace', false),
// 应用模式状态
... ... @@ -272,7 +272,7 @@ return [
//会员注册验证码类型email/mobile/wechat/text/false
'user_register_captcha' => 'text',
//登录验证码
'login_captcha' => true,
'login_captcha' => false,
//登录失败超过10次则1天后重试
'login_failure_retry' => true,
//是否同一账号同一时间只能在一个地方登录
... ...
... ... @@ -1334,7 +1334,7 @@ a.text-primary:focus {
color: #30364a;
}
.text-success {
color: #18bc9c;
color: #007AFF;
}
a.text-success:hover,
a.text-success:focus {
... ... @@ -3104,19 +3104,19 @@ fieldset[disabled] .btn-default.focus {
}
.btn-primary {
color: #fff;
background-color: #444c69;
border-color: #444c69;
background-color: #007bff;
border-color: #007bff;
}
.btn-primary:focus,
.btn-primary.focus {
color: #fff;
background-color: #30364a;
border-color: #12141c;
background-color: #007bff;
border-color: #007bff;
}
.btn-primary:hover {
color: #fff;
background-color: #30364a;
border-color: #2c3144;
background-color: #007bff;
border-color: #007bff;
}
.btn-primary:active,
.btn-primary.active,
... ... @@ -3135,8 +3135,8 @@ fieldset[disabled] .btn-default.focus {
.btn-primary.active.focus,
.open > .dropdown-toggle.btn-primary.focus {
color: #fff;
background-color: #222634;
border-color: #12141c;
background-color: #007bff;
border-color: #007bff;
}
.btn-primary:active,
.btn-primary.active,
... ... @@ -3152,8 +3152,8 @@ fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus {
background-color: #444c69;
border-color: #444c69;
background-color: #007bff;
border-color: #007bff;
}
.btn-primary .badge {
color: #444c69;
... ... @@ -3161,26 +3161,26 @@ fieldset[disabled] .btn-primary.focus {
}
.btn-success {
color: #fff;
background-color: #18bc9c;
border-color: #18bc9c;
background-color: #1F78FF;
border-color: #1F78FF;
}
.btn-success:focus,
.btn-success.focus {
color: #fff;
background-color: #128f76;
border-color: #0a4b3e;
background-color: #007AFF;
border-color: #002e5e;
}
.btn-success:hover {
color: #fff;
background-color: #128f76;
border-color: #11866f;
background-color: #007AFF;
border-color: #007AFF;
}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
color: #fff;
background-color: #128f76;
border-color: #11866f;
background-color: #007AFF;
border-color: #007AFF;
}
.btn-success:active:hover,
.btn-success.active:hover,
... ... @@ -3555,7 +3555,7 @@ tbody.collapse.in {
color: #fff;
text-decoration: none;
outline: 0;
background-color: #444c69;
background-color: #007AFF;
}
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
... ... @@ -4739,8 +4739,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:focus {
z-index: 3;
color: #fff;
background-color: #444c69;
border-color: #444c69;
background-color: #007AFF;
border-color: #007AFF;
cursor: default;
}
.pagination > .disabled > span,
... ... @@ -6724,4 +6724,4 @@ button.close {
display: none !important;
}
}
/*# sourceMappingURL=bootstrap.css.map */
\ No newline at end of file
/*# sourceMappingURL=bootstrap.css.map */
... ...
... ... @@ -23,16 +23,16 @@
.skin-blue .main-header .navbar .nav .open > a:focus,
.skin-blue .main-header .navbar .nav > .active > a {
background: rgba(0, 0, 0, 0.02);
color: #4e73df;
color: #007AFF;
}
.skin-blue .main-header .navbar .nav-addtabs li > .close-tab {
color: #4e73df;
color: #007AFF;
}
.skin-blue .main-header .navbar .sidebar-toggle {
color: #444;
}
.skin-blue .main-header .navbar .sidebar-toggle:hover {
color: #4e73df;
color: #007AFF;
background: rgba(0, 0, 0, 0.02);
}
.skin-blue .main-header .navbar > .sidebar-toggle {
... ... @@ -49,14 +49,15 @@
border-right-width: 0;
}
.skin-blue .main-header > .logo {
background-color: #4e73df;
color: #fff;
background-color: #fff;
color: #144496;
font-weight: bold;
border-bottom: 0 solid transparent;
border-right: 1px solid #4e73df;
border-right: 1px solid #fff;
box-shadow: none;
}
.skin-blue .main-header > .logo:hover {
background-color: #4a70de;
background-color: #fff;
}
@media (max-width: 767px) {
.skin-blue .main-header > .logo {
... ... @@ -70,7 +71,7 @@
}
}
.skin-blue .main-header li.user-header {
background-color: #4e73df;
background-color: #007AFF;
}
.skin-blue .main-header .nav-addtabs > li > a,
.skin-blue .main-header .nav-addtabs > li.active > a {
... ... @@ -83,7 +84,7 @@
.skin-blue .wrapper,
.skin-blue .main-sidebar,
.skin-blue .left-side {
background-color: #4e73df;
background-color: #fff;
}
.skin-blue .user-panel > .info,
.skin-blue .user-panel > .info > a {
... ... @@ -98,25 +99,29 @@
}
.skin-blue .sidebar-menu > li:hover > a,
.skin-blue .sidebar-menu > li.active > a {
color: #fff;
background: #456cdd;
color: #007AFF;
background: #f6fcff;
border-left-color: #fff;
}
.skin-blue .sidebar-menu > li > .treeview-menu {
background: #4169dd;
background: #fff;
}
.skin-blue .sidebar a {
color: #ccd9ff;
color: #293452;
}
.skin-blue .sidebar a:hover {
text-decoration: none;
}
.skin-blue .treeview-menu > li > a {
color: #ccd9ff;
.sidebar-mini.sidebar-collapse .sidebar-menu .treeview > a > .treeview-menu ,
.sidebar-mini.sidebar-collapse .sidebar-menu > .treeview > a > span:first-of-type ,
.sidebar-mini.sidebar-collapse .sidebar-menu .active > a > span:first-of-type
{
-webkit-box-shadow: 8px 4px 8px 0 #000d6114;
box-shadow: 8px 4px 8px 0 #000d6114;
}
.skin-blue .treeview-menu > li.active > a,
.skin-blue .treeview-menu > li > a:hover {
color: #fff;
color: #007AFF;
}
.skin-blue .sidebar-form {
border-radius: 3px;
... ... @@ -183,9 +188,10 @@
.skin-blue .sidebar-form .btn {
color: #fff;
}
@media (max-width: 767px) {
.skin-blue.multiplenav .main-header .navbar {
background-color: #4e73df;
background-color: #007AFF;
}
.skin-blue.multiplenav .main-header .navbar .nav > li > a {
color: #fff;
... ... @@ -211,7 +217,7 @@
background: rgba(0, 0, 0, 0.1);
}
.skin-blue.multiplenav .main-header > .logo {
background-color: #4e73df;
background-color: #007AFF;
color: #fff;
border-bottom: 0 solid transparent;
}
... ... @@ -227,4 +233,4 @@
color: #7995e7;
}
}
/*# sourceMappingURL=skin-blue.css.map */
\ No newline at end of file
/*# sourceMappingURL=skin-blue.css.map */
... ...