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

修改BUG：modal垂直居中，更改control-label样式

This commit is contained in:
Argo-MacBookPro 2018-08-03 13:24:26 +08:00
parent c4da68cf48
commit e8356b587e
11 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,10 @@
} }
@section modal { @section modal {
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <h5 class="modal-title" id="myModalLabel">菜单编辑窗口</h5>
<h4 class="modal-title" id="myModalLabel">菜单编辑窗口</h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-inline" id="dataForm"> <form class="form-inline" id="dataForm">

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

@ -33,10 +33,10 @@
<button id="btn_assignUser" type="button" class="btn btn-info"> <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 class="hidden-tb">指派用户</span>
</button> </button>
<button id="btn_assignGroup" type="button" class="btn btn-info"> <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 class="hidden-tb">指派部门</span>
</button> </button>
<button id="btn_assignMenu" type="button" class="btn btn-info"> <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 class="hidden-tb">指派菜单</span>
</button> </button>
<div class="toolbar btn-group dropdown"> <div class="toolbar btn-group dropdown">

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

@ -30,7 +30,7 @@
</form> </form>
} }
@section toolbar { @section toolbar {
<button id="btn_assignRole" type="button" class="btn btn-info"> <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 class="hidden-tb">指派角色</span>
</button> </button>
<button id="btn_assignGroup" type="button" class="btn btn-info"> <button id="btn_assignGroup" type="button" class="btn btn-info">
@ -47,18 +47,18 @@
} }
@section modal { @section modal {
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="myModalLabel">用户编辑窗口</h5>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">用户编辑窗口</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-inline"> <form class="form-inline">
<input type="text" class="form-control" hidden id="userID" data-default-val="0" />
<div class="form-row"> <div class="form-row">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label" for="userName">登陆名称</label> <label class="control-label" for="userName">登陆名称</label>
<input type="text" class="form-control" id="userName" placeholder="不可为空，50字以内" minlength="4" maxlength="50" remote="api/New/" data-remote-msg="此用户已存在" data-valid="true" /> <input type="text" class="form-control" id="userName" placeholder="不可为空，50字以内" minlength="4" maxlength="50" remote="api/New/" data-remote-msg="此用户已存在" data-valid="true" />
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<input type="text" class="form-control hidden" id="userID" data-default-val="0" />
<label class="control-label" for="userName">显示名称</label> <label class="control-label" for="userName">显示名称</label>
<input type="text" class="form-control" id="displayName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" /> <input type="text" class="form-control" id="displayName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
</div> </div>

2
Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
View File

@ -1,5 +1,5 @@
<div class="modal fade" id="dialogGroup" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myGroupModalLabel" aria-hidden="true"> <div class="modal fade" id="dialogGroup" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myGroupModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

2
Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
View File

@ -1,5 +1,5 @@
<div class="modal fade" id="dialogRole" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myRoleModalLabel" aria-hidden="true"> <div class="modal fade" id="dialogRole" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myRoleModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

2
Bootstrap.Admin/Views/Shared/UserConfig.cshtml
View File

@ -1,5 +1,5 @@
<div class="modal fade" id="dialogUser" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myUserModalLabel" aria-hidden="true"> <div class="modal fade" id="dialogUser" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myUserModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

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

@ -29,7 +29,7 @@
} }
@section modal { @section modal {
<div class="modal fade" id="dialogNew" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="dialogNew" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content" data-toggle="LgbValidate" data-valid-button="#btnSubmit"> <div class="modal-content" data-toggle="LgbValidate" data-valid-button="#btnSubmit">
@RenderSection("modal", false) @RenderSection("modal", false)
<div class="modal-footer"> <div class="modal-footer">
@ -51,7 +51,7 @@
@RenderSection("query", false) @RenderSection("query", false)
</div> </div>
</div> </div>
<div id="toolbar" class="btn-group hidden"> <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_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_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_edit" type="button" class="btn btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i><span class="hidden-tb">编辑</span></button>

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

@ -59,6 +59,14 @@
} }
} }
@media (max-width: 939px) {
.modal-dialog {
max-width: calc(90%);
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 940px) { @media (min-width: 940px) {
.hidden-tb { .hidden-tb {
display: inline; display: inline;
@ -66,6 +74,7 @@
.modal-dialog { .modal-dialog {
width: 900px; width: 900px;
max-width: 900px;
} }
.form-group .form-control-url { .form-group .form-control-url {
@ -81,7 +90,7 @@
@media (min-height: 568px) { @media (min-height: 568px) {
.modal .modal-body { .modal .modal-body {
max-height: 350px; max-height: 380px;
} }
} }

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

@ -51,6 +51,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
justify-content: flex-start;
} }
@ -62,10 +63,6 @@
padding-right: 30px; padding-right: 30px;
} }
.btn:focus, .btn:active:focus {
outline: none;
}
.btn span:last-child { .btn span:last-child {
margin-left: 4px; margin-left: 4px;
} }
@ -91,10 +88,6 @@
padding: 10px 15px; padding: 10px 15px;
} }
.modal-header .close {
margin-top: 1px;
}
.modal-body .checkbox, .modal-body .radio { .modal-body .checkbox, .modal-body .radio {
min-width: 190px; min-width: 190px;
overflow: hidden; overflow: hidden;
@ -117,8 +110,8 @@
background-position: right 8px center; background-position: right 8px center;
} }
.has-error .input-group-btn button, .has-error .input-group-btn button:active:focus { .has-error .form-control, .has-error .input-group-btn button, .has-error .input-group-btn button:active:focus {
border-color: #a94442; border-color: #dc3545;
} }
.has-success input { .has-success input {
@ -137,8 +130,8 @@
background-image: url(../img/loading-sm.gif); background-image: url(../img/loading-sm.gif);
} }
.has-success .input-group-btn button, .has-success .input-group-btn button:active:focus { .has-success .form-control, .has-success .input-group-btn button, .has-success .input-group-btn button:active:focus {
border-color: #3c763d; border-color: #28a745;
} }
.main-content { .main-content {

7
Bootstrap.Admin/wwwroot/css/site-responsive.css
View File

@ -4,6 +4,13 @@
} }
} }
@media(min-width: 576px) {
.form-inline label {
padding-top: 5px;
padding-bottom: 5px;
}
}
@media (min-width: 736px) { @media (min-width: 736px) {
.sidebar-toggle-box span { .sidebar-toggle-box span {
display: inline; display: inline;

15
Bootstrap.Admin/wwwroot/css/site.css
View File

@ -16,8 +16,8 @@ ul li {
list-style: none; list-style: none;
} }
.btn:focus { .btn {
box-shadow: none; font-size: 0.875rem;
} }
.form-control { .form-control {
@ -477,8 +477,9 @@ a, a:hover, a:focus {
background-color: #a94442; background-color: #a94442;
} }
.tooltip.has-error .arrow { .tooltip.has-error .arrow:before {
border-top-color: #a94442; border-top-color: #a94442;
border-bottom-color: #a94442;
} }
.file-drop-zone.clickable:hover { .file-drop-zone.clickable:hover {
@ -489,3 +490,11 @@ a, a:hover, a:focus {
.card { .card {
margin-bottom: 15px; margin-bottom: 15px;
} }
label.dropdown-item:first-child {
margin-top: 0.5rem;
}
.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
line-height: normal;
}