From e8356b587e1fea0e163225b996d0f3ec5c9eec4e Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Fri, 3 Aug 2018 13:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9Amodal=E5=9E=82?=
 =?UTF-8?q?=E7=9B=B4=E5=B1=85=E4=B8=AD=EF=BC=8C=E6=9B=B4=E6=94=B9control-l?=
 =?UTF-8?q?abel=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Menus.cshtml        |  6 ++++--
 Bootstrap.Admin/Views/Admin/Roles.cshtml        |  4 ++--
 Bootstrap.Admin/Views/Admin/Users.cshtml        |  6 +++---
 Bootstrap.Admin/Views/Shared/GroupConfig.cshtml |  2 +-
 Bootstrap.Admin/Views/Shared/RoleConfig.cshtml  |  2 +-
 Bootstrap.Admin/Views/Shared/UserConfig.cshtml  |  2 +-
 Bootstrap.Admin/Views/Shared/_Default.cshtml    |  4 ++--
 .../wwwroot/css/admin-responsive.css            | 11 ++++++++++-
 Bootstrap.Admin/wwwroot/css/admin.css           | 17 +++++------------
 Bootstrap.Admin/wwwroot/css/site-responsive.css |  7 +++++++
 Bootstrap.Admin/wwwroot/css/site.css            | 15 ++++++++++++---
 11 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index c1064b33..2e01fd55 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -72,8 +72,10 @@
 }
 @section modal {
     <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="myModalLabel">菜单编辑窗口</h4>
+        <h5 class="modal-title" id="myModalLabel">菜单编辑窗口</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
     </div>
     <div class="modal-body">
         <form class="form-inline" id="dataForm">
diff --git a/Bootstrap.Admin/Views/Admin/Roles.cshtml b/Bootstrap.Admin/Views/Admin/Roles.cshtml
index 519e4dde..2ab771a8 100644
--- a/Bootstrap.Admin/Views/Admin/Roles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Roles.cshtml
@@ -33,10 +33,10 @@
     <button id="btn_assignUser" type="button" class="btn btn-info">
         <span class="fa fa-user" aria-hidden="true"></span><span class="hidden-tb">指派用户</span>
     </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>
     </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>
     </button>
     <div class="toolbar btn-group dropdown">
diff --git a/Bootstrap.Admin/Views/Admin/Users.cshtml b/Bootstrap.Admin/Views/Admin/Users.cshtml
index 4541aa41..65065b6f 100644
--- a/Bootstrap.Admin/Views/Admin/Users.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Users.cshtml
@@ -30,7 +30,7 @@
     </form>
 }
 @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>
     </button>
     <button id="btn_assignGroup" type="button" class="btn btn-info">
@@ -47,18 +47,18 @@
 }
 @section modal {
     <div class="modal-header">
+        <h5 class="modal-title" id="myModalLabel">用户编辑窗口</h5>
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="myModalLabel">用户编辑窗口</h4>
     </div>
     <div class="modal-body">
         <form class="form-inline">
+            <input type="text" class="form-control" hidden id="userID" data-default-val="0" />
             <div class="form-row">
                 <div class="form-group col-sm-6">
                     <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" />
                 </div>
                 <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>
                     <input type="text" class="form-control" id="displayName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
diff --git a/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml b/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
index 20929be9..bc9ebc1a 100644
--- a/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
+++ b/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
@@ -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-dialog">
+    <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml b/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
index 376b48d0..d29923e5 100644
--- a/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
+++ b/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
@@ -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-dialog">
+    <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/Bootstrap.Admin/Views/Shared/UserConfig.cshtml b/Bootstrap.Admin/Views/Shared/UserConfig.cshtml
index 9009e8f5..b8487210 100644
--- a/Bootstrap.Admin/Views/Shared/UserConfig.cshtml
+++ b/Bootstrap.Admin/Views/Shared/UserConfig.cshtml
@@ -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-dialog">
+    <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/Bootstrap.Admin/Views/Shared/_Default.cshtml b/Bootstrap.Admin/Views/Shared/_Default.cshtml
index 6727d1e9..c4ae56f8 100644
--- a/Bootstrap.Admin/Views/Shared/_Default.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Default.cshtml
@@ -29,7 +29,7 @@
 }
 @section modal {
     <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">
                 @RenderSection("modal", false)
                 <div class="modal-footer">
@@ -51,7 +51,7 @@
         @RenderSection("query", false)
     </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_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>
diff --git a/Bootstrap.Admin/wwwroot/css/admin-responsive.css b/Bootstrap.Admin/wwwroot/css/admin-responsive.css
index 01a04f54..8a67f4d9 100644
--- a/Bootstrap.Admin/wwwroot/css/admin-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/admin-responsive.css
@@ -59,6 +59,14 @@
     }
 }
 
+@media (max-width: 939px) {
+    .modal-dialog {
+        max-width: calc(90%);
+        margin-left: auto;
+        margin-right: auto;
+    }
+}
+
 @media (min-width: 940px) {
     .hidden-tb {
         display: inline;
@@ -66,6 +74,7 @@
 
     .modal-dialog {
         width: 900px;
+        max-width: 900px;
     }
 
     .form-group .form-control-url {
@@ -81,7 +90,7 @@
 
 @media (min-height: 568px) {
     .modal .modal-body {
-        max-height: 350px;
+        max-height: 380px;
     }
 }
 
diff --git a/Bootstrap.Admin/wwwroot/css/admin.css b/Bootstrap.Admin/wwwroot/css/admin.css
index 6a87d307..5ee8afda 100644
--- a/Bootstrap.Admin/wwwroot/css/admin.css
+++ b/Bootstrap.Admin/wwwroot/css/admin.css
@@ -51,6 +51,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        justify-content: flex-start;
     }
 
 
@@ -62,10 +63,6 @@
         padding-right: 30px;
     }
 
-.btn:focus, .btn:active:focus {
-    outline: none;
-}
-
 .btn span:last-child {
     margin-left: 4px;
 }
@@ -91,10 +88,6 @@
     padding: 10px 15px;
 }
 
-    .modal-header .close {
-        margin-top: 1px;
-    }
-
 .modal-body .checkbox, .modal-body .radio {
     min-width: 190px;
     overflow: hidden;
@@ -117,8 +110,8 @@
     background-position: right 8px center;
 }
 
-.has-error .input-group-btn button, .has-error .input-group-btn button:active:focus {
-    border-color: #a94442;
+.has-error .form-control, .has-error .input-group-btn button, .has-error .input-group-btn button:active:focus {
+    border-color: #dc3545;
 }
 
 .has-success input {
@@ -137,8 +130,8 @@
     background-image: url(../img/loading-sm.gif);
 }
 
-.has-success .input-group-btn button, .has-success .input-group-btn button:active:focus {
-    border-color: #3c763d;
+.has-success .form-control, .has-success .input-group-btn button, .has-success .input-group-btn button:active:focus {
+    border-color: #28a745;
 }
 
 .main-content {
diff --git a/Bootstrap.Admin/wwwroot/css/site-responsive.css b/Bootstrap.Admin/wwwroot/css/site-responsive.css
index 3d6fe49d..e579ea65 100644
--- a/Bootstrap.Admin/wwwroot/css/site-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/site-responsive.css
@@ -4,6 +4,13 @@
     }
 }
 
+@media(min-width: 576px) {
+    .form-inline label {
+        padding-top: 5px;
+        padding-bottom: 5px;
+    }
+}
+
 @media (min-width: 736px) {
     .sidebar-toggle-box span {
         display: inline;
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index 362eb8d4..0a80bd43 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -16,8 +16,8 @@ ul li {
     list-style: none;
 }
 
-.btn:focus {
-    box-shadow: none;
+.btn {
+    font-size: 0.875rem;
 }
 
 .form-control {
@@ -477,8 +477,9 @@ a, a:hover, a:focus {
     background-color: #a94442;
 }
 
-.tooltip.has-error .arrow {
+.tooltip.has-error .arrow:before {
     border-top-color: #a94442;
+    border-bottom-color: #a94442;
 }
 
 .file-drop-zone.clickable:hover {
@@ -489,3 +490,11 @@ a, a:hover, a:focus {
 .card {
     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;
+}