orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：整理hidden-tb

This commit is contained in:
Argo-MacBookPro 2018-08-04 19:01:43 +08:00
parent b33608c293
commit ed7d50d792
11 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bootstrap.Admin/Views/Admin/Exceptions.cshtml
View File

@ -55,7 +55,7 @@
</div>
<div id="toolbar" class="btn-group d-none">
<button id="btn_view" type="button" class="btn btn-danger">
<i class="fa fa-file-text-o" aria-hidden="true"></i><span class="hidden-tb">服务器日志</span>
<i class="fa fa-file-text-o" aria-hidden="true"></i><span>服务器日志</span>
</button>
<div class="toolbar btn-group dropdown">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>

4
Bootstrap.Admin/Views/Admin/Groups.cshtml
View File

@ -25,10 +25,10 @@
}
@section toolbar {
<button id="btn_assignRole" type="button" class="btn btn-info">
<span class="fa fa-sitemap" aria-hidden="true"></span><span class="hidden-tb">指派角色</span>
<span class="fa fa-sitemap" aria-hidden="true"></span><span>指派角色</span>
</button>
<button id="btn_assignUser" type="button" class="btn btn-info">
<span class="fa fa-user" aria-hidden="true"></span><span class="hidden-tb">指派用户</span>
<span class="fa fa-user" aria-hidden="true"></span><span>指派用户</span>
</button>
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>

2
Bootstrap.Admin/Views/Admin/Menus.cshtml
View File

@ -58,7 +58,7 @@
}
@section toolbar {
<button id="btn_assignRole" type="button" class="btn btn-info">
<span class="fa fa-sitemap" aria-hidden="true"></span><span class="hidden-tb">指派角色</span>
<span class="fa fa-sitemap" aria-hidden="true"></span><span>指派角色</span>
</button>
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>

6
Bootstrap.Admin/Views/Admin/Roles.cshtml
View File

@ -31,13 +31,13 @@
}
@section toolbar{
<button id="btn_assignUser" type="button" class="btn btn-info">
<span class="fa fa-user" aria-hidden="true"></span><span class="hidden-tb">指派用户</span>
<span class="fa fa-user" aria-hidden="true"></span><span>指派用户</span>
</button>
<button id="btn_assignGroup" type="button" class="btn btn-warning">
<span class="fa fa-bank" aria-hidden="true"></span><span class="hidden-tb">指派部门</span>
<span class="fa fa-bank" aria-hidden="true"></span><span>指派部门</span>
</button>
<button id="btn_assignMenu" type="button" class="btn btn-secondary">
<span class="fa fa-dashboard" aria-hidden="true"></span><span class="hidden-tb">指派菜单</span>
<span class="fa fa-dashboard" aria-hidden="true"></span><span>指派菜单</span>
</button>
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>

4
Bootstrap.Admin/Views/Admin/Users.cshtml
View File

@ -25,10 +25,10 @@
}
@section toolbar {
<button id="btn_assignRole" type="button" class="btn btn-warning">
<span class="fa fa-sitemap" aria-hidden="true"></span><span class="hidden-tb">指派角色</span>
<span class="fa fa-sitemap" aria-hidden="true"></span><span>指派角色</span>
</button>
<button id="btn_assignGroup" type="button" class="btn btn-info">
<span class="fa fa-bank" aria-hidden="true"></span><span class="hidden-tb">指派部门</span>
<span class="fa fa-bank" aria-hidden="true"></span><span>指派部门</span>
</button>
<div class="toolbar btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>

6
Bootstrap.Admin/Views/Shared/_Default.cshtml
View File

@ -52,9 +52,9 @@
</div>
</div>
<div id="toolbar" class="btn-group d-none">
<button id="btn_add" type="button" class="btn btn-success"><i class="fa fa-plus" aria-hidden="true"></i><span class="hidden-tb">新增</span></button>
<button id="btn_delete" type="button" class="btn btn-danger"><i class="fa fa-remove" aria-hidden="true"></i><span class="hidden-tb">删除</span></button>
<button id="btn_edit" type="button" class="btn btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i><span class="hidden-tb">编辑</span></button>
<button id="btn_add" type="button" class="btn btn-success"><i class="fa fa-plus" aria-hidden="true"></i><span>新增</span></button>
<button id="btn_delete" type="button" class="btn btn-danger"><i class="fa fa-remove" aria-hidden="true"></i><span>删除</span></button>
<button id="btn_edit" type="button" class="btn btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i><span>编辑</span></button>
@RenderSection("toolbar", false)
</div>
<div id="panelResult" class="card">

1
Bootstrap.Admin/Views/Shared/_Layout.cshtml
View File

@ -13,6 +13,7 @@
<link href="~/css/nprogress.css" rel="stylesheet" />
@RenderSection("css", false)
<link href="~/css/theme.css" rel="stylesheet" />
<link href="~/css/theme-responsive.css" rel="stylesheet" />
<link href="~/css/site.css" rel="stylesheet" />
<link href="~/css/site-responsive.css" rel="stylesheet" />
}

22
Bootstrap.Admin/wwwroot/css/admin-responsive.css
View File

@ -13,22 +13,6 @@
}
}
@media (min-width: 576px) {
.form-group .form-control-url {
width: calc(100% - 90px);
}
}
@media (min-width: 568px) {
.toolbar {
display: none;
}
.bs-bars {
display: inline-block;
}
}
@media (min-width: 768px) {
.sidebar {
top: 98px;
@ -61,12 +45,6 @@
}
}
@media (min-width: 940px) {
.hidden-tb {
display: inline;
}
}
@media (min-height: 672px) {
.sidebar {
top: 98px;

2
Bootstrap.Admin/wwwroot/css/admin.css
View File

@ -18,7 +18,7 @@
font-weight: 600;
}
.hidden-tb, .hidden-375 {
.hidden-375 {
display: none;
}

21
Bootstrap.Admin/wwwroot/css/theme-responsive.css Normal file
View File

@ -0,0 +1,21 @@
@media (min-width: 576px) {
.form-group .form-control-url {
width: calc(100% - 90px);
}
}
@media (min-width: 568px) {
.toolbar {
display: none;
}
.bs-bars {
display: inline-block;
}
}
@media (min-width: 940px) {
.btn span:last-child {
display: inline;
}
}

1
Bootstrap.Admin/wwwroot/css/theme.css
View File

@ -57,6 +57,7 @@ input.pending {
.btn span:last-child {
margin-left: 4px;
display: none;
}
input[data-valid="true"] {