From b33608c29343d590549ed25a9f1593ea83ee2ef8 Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Sat, 4 Aug 2018 18:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F=E5=88=B0theme.css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Exceptions.cshtml |  20 +--
 Bootstrap.Admin/Views/Admin/Logs.cshtml       |   2 +-
 .../Views/Shared/GroupConfig.cshtml           |   4 +-
 .../Views/Shared/RoleConfig.cshtml            |   3 +-
 .../Views/Shared/UserConfig.cshtml            |   4 +-
 Bootstrap.Admin/Views/Shared/_Default.cshtml  |   2 +-
 Bootstrap.Admin/wwwroot/css/admin.css         | 124 +-----------------
 Bootstrap.Admin/wwwroot/css/fa.css            |  12 +-
 Bootstrap.Admin/wwwroot/css/theme.css         |  69 ++++++++++
 Bootstrap.Admin/wwwroot/js/Exceptions.js      |   6 +-
 Bootstrap.Admin/wwwroot/js/Longbow.Common.js  |   2 +-
 11 files changed, 102 insertions(+), 146 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml b/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
index c70756bf..745a03e0 100644
--- a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
@@ -53,7 +53,7 @@
         </form>
     </div>
 </div>
-<div id="toolbar" class="btn-group hidden">
+<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>
     </button>
@@ -68,13 +68,13 @@
     <div class="card-header">
         查询结果
     </div>
-    <div class="panel-body barTable">
+    <div class="card-body">
         <table></table>
     </div>
 </div>
 @section modal {
     <div class="modal fade" id="dialogNew" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div id="errorList" class="modal-dialog">
+        <div id="errorList" class="modal-dialog modal-dialog-centered modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="myModalLabel">程序异常日志窗口</h5>
@@ -97,13 +97,15 @@
             <button type="button" class="close" aria-hidden="true">&times;</button>
         </div>
         <div class="modal-body">
-            <i id="fa-top" class="fa-target"></i>
-            <div class="affix" id="myScrollspy">
-                <div><a href="#fa-top" class="fa fa-arrow-circle-up"></a></div>
-                <div><a href="#fa-bottom" class="fa fa-arrow-circle-down"></a></div>
+            <div class="iconview">
+                <i id="fa-top" class="fa-target"></i>
+                <div class="affix">
+                    <div><a href="#fa-top" class="fa fa-arrow-circle-up"></a></div>
+                    <div><a href="#fa-bottom" class="fa fa-arrow-circle-down"></a></div>
+                </div>
+                <div id="dataFormDetail" class="ex-content"><div class="text-center"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div></div>
+                <i id="fa-bottom" class="fa-target"></i>
             </div>
-            <div id="dataFormDetail" class="ex-content"><div class="text-center"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div></div>
-            <i id="fa-bottom" class="fa-target"></i>
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-secondary">
diff --git a/Bootstrap.Admin/Views/Admin/Logs.cshtml b/Bootstrap.Admin/Views/Admin/Logs.cshtml
index deb81d67..357917c1 100644
--- a/Bootstrap.Admin/Views/Admin/Logs.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Logs.cshtml
@@ -72,7 +72,7 @@
     <div class="card-header">
         查询结果
     </div>
-    <div class="panel-body barTable">
+    <div class="card-body">
         <table></table>
     </div>
 </div>
\ No newline at end of file
diff --git a/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml b/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
index 9a2ea27b..5a598773 100644
--- a/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
+++ b/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
@@ -6,7 +6,9 @@
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
-                <form id="groupForm" class="form-inline"></form>
+                <form class="form-inline">
+                    <div class="row" id="groupForm"></div>
+                </form>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
diff --git a/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml b/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
index 1acdceab..7eb414b9 100644
--- a/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
+++ b/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
@@ -6,7 +6,8 @@
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
-                <form id="roleForm" class="form-inline">
+                <form class="form-inline">
+                    <div class="row" id="roleForm"></div>
                 </form>
             </div>
             <div class="modal-footer">
diff --git a/Bootstrap.Admin/Views/Shared/UserConfig.cshtml b/Bootstrap.Admin/Views/Shared/UserConfig.cshtml
index 17266b84..085a5b2e 100644
--- a/Bootstrap.Admin/Views/Shared/UserConfig.cshtml
+++ b/Bootstrap.Admin/Views/Shared/UserConfig.cshtml
@@ -6,7 +6,9 @@
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
-                <form id="userForm" class="form-inline"></form>
+                <form class="form-inline">
+                    <div class="row" id="userForm"></div>
+                </form>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
diff --git a/Bootstrap.Admin/Views/Shared/_Default.cshtml b/Bootstrap.Admin/Views/Shared/_Default.cshtml
index cf9f9fae..4a80863f 100644
--- a/Bootstrap.Admin/Views/Shared/_Default.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Default.cshtml
@@ -61,7 +61,7 @@
     <div id="panelResultHeader" class="card-header">
         查询结果
     </div>
-    <div class="card-body barTable">
+    <div class="card-body">
         <table></table>
     </div>
 </div>
\ No newline at end of file
diff --git a/Bootstrap.Admin/wwwroot/css/admin.css b/Bootstrap.Admin/wwwroot/css/admin.css
index 7184085e..c7e9da39 100644
--- a/Bootstrap.Admin/wwwroot/css/admin.css
+++ b/Bootstrap.Admin/wwwroot/css/admin.css
@@ -37,69 +37,6 @@
         color: #ac2925;
     }
 
-.form-inline .form-group {
-    margin-bottom: 15px;
-}
-
-    .form-inline .form-group .control-label {
-        margin-right: 10px;
-        width: 80px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        justify-content: flex-start;
-    }
-
-
-.modal-dialog .modal-body, .card-body {
-    padding: 15px 15px 0 15px;
-}
-
-    .modal-dialog .modal-body .form-inline .form-group input[type="text"], .modal-dialog .modal-body .form-inline .form-group input[type="password"] {
-        padding-right: 30px;
-    }
-
-.btn span:last-child {
-    margin-left: 4px;
-}
-
-.modal-header {
-    background-color: #f5f5f5;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-    padding: 10px 15px;
-}
-
-.modal-body .checkbox, .modal-body .radio {
-    min-width: 190px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-.modal-footer .btn {
-    padding-left: 22px;
-    padding-right: 22px;
-}
-
-input.is-invalid {
-    background-repeat: no-repeat;
-    background-image: url('../images/error.png');
-    background-position: right 8px center;
-}
-
-input.is-valid {
-    background-repeat: no-repeat;
-    background-image: url('../images/success.png');
-    background-position: right 8px center;
-}
-
-input.pending {
-    background-repeat: no-repeat;
-    background-image: url(../img/loading-sm.gif);
-    background-position: right 8px center;
-}
-
 .main-content {
     transition: all .4s ease-in-out;
     padding: 15px 15px 0 15px;
@@ -218,30 +155,13 @@ aside {
                     padding: 12px 0;
                 }
 
-/*Modal Dialog Checkbox*/
-.modal-body .checkbox, .modal-dialog .radio {
-    padding: 0;
-    margin-top: 0;
-}
-
-    .modal-body .checkbox label, .modal-body .radio label {
-        padding-left: 0;
-    }
-
-        .modal-body .checkbox label input[type='checkbox'], .modal-body .radio label input[type='radio'] {
-            margin: 0 4px 0 0;
-            vertical-align: middle;
-            position: relative;
-            top: -1px;
-        }
-
-.modal-body .affix {
+.affix {
     position: fixed;
     bottom: 95px;
     right: 50px;
 }
 
-    .modal-body .affix a {
+    .affix a {
         font-size: 2rem;
         margin-top: 16px;
     }
@@ -281,24 +201,6 @@ aside {
                 color: #235e90;
             }
 
-/*cache*/
-.panel .fa-refresh {
-    font-size: 1.5rem;
-}
-
-.bootstrap-select .dropdown-menu {
-    padding: 0;
-}
-
-    .bootstrap-select .dropdown-menu > li > a {
-        padding-top: 7px;
-        padding-bottom: 7px;
-    }
-
-input[type="datetime"] {
-    min-width: 220px;
-}
-
 /*Messages*/
 .mail-box {
     display: flex;
@@ -432,25 +334,3 @@ input[type="datetime"] {
                 .mail-box .lg-side .table-inbox tr td:hover {
                     cursor: pointer;
                 }
-
-/*Bootstrap Table BUG */
-.fixed-table-loading {
-    padding-top: 5px;
-}
-
-.bootstrap-table {
-    padding-bottom: 15px;
-}
-
-    .bootstrap-table .fixed-table-body .table {
-        border-bottom: none;
-    }
-/*Bootstrap Table BUG END*/
-
-.input-group.form_date span {
-    border-left: none;
-}
-
-.barTable {
-    padding: 5px 15px 0px 15px;
-}
diff --git a/Bootstrap.Admin/wwwroot/css/fa.css b/Bootstrap.Admin/wwwroot/css/fa.css
index db0f4361..7f6a0e3f 100644
--- a/Bootstrap.Admin/wwwroot/css/fa.css
+++ b/Bootstrap.Admin/wwwroot/css/fa.css
@@ -217,14 +217,8 @@
             margin-right: 10px;
         }
 
-.logitem {
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
 .logfile {
     color: #d41404;
-    white-space: nowrap;
 }
 
     .logfile:focus, .logfile:active, .logfile:hover {
@@ -233,6 +227,12 @@
 
     .logfile span {
         margin-left: 4px;
+        max-width: 146px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        display: inline-block;
+        vertical-align: middle;
     }
 
 .modal-header > h4 {
diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css
index 34f8bb7a..5f7b50d9 100644
--- a/Bootstrap.Admin/wwwroot/css/theme.css
+++ b/Bootstrap.Admin/wwwroot/css/theme.css
@@ -11,6 +11,75 @@
     border-bottom-color: #dc3545;
 }
 
+input.is-invalid {
+    background-repeat: no-repeat;
+    background-image: url('../images/error.png');
+    background-position: right 8px center;
+}
+
+input.is-valid {
+    background-repeat: no-repeat;
+    background-image: url('../images/success.png');
+    background-position: right 8px center;
+}
+
+input.pending {
+    background-repeat: no-repeat;
+    background-image: url(../img/loading-sm.gif);
+    background-position: right 8px center;
+}
+
 .form-check-input {
     margin-top: 6.4px;
 }
+
+.form-inline .form-group {
+    margin-bottom: 15px;
+}
+
+    .form-inline .form-group .control-label {
+        margin-right: 10px;
+        width: 80px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        justify-content: flex-start;
+    }
+
+.modal-header {
+    background-color: #f5f5f5;
+    padding: 10px 15px;
+}
+
+.modal-body, .card-body {
+    padding: 15px 15px 0 15px;
+}
+
+.btn span:last-child {
+    margin-left: 4px;
+}
+
+input[data-valid="true"] {
+    padding-right: 30px;
+}
+
+.form-check-input + span, .form-check-input + label {
+    max-width: 148px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+/*Bootstrap Table BUG */
+.fixed-table-loading {
+    padding: 8px;
+}
+
+.bootstrap-table .fixed-table-body .table {
+    border-bottom: none;
+}
+
+.card-body .bootstrap-table {
+    margin-top: -10px;
+}
+/*Bootstrap Table BUG END*/
diff --git a/Bootstrap.Admin/wwwroot/js/Exceptions.js b/Bootstrap.Admin/wwwroot/js/Exceptions.js
index 92e42ea3..d84846b9 100644
--- a/Bootstrap.Admin/wwwroot/js/Exceptions.js
+++ b/Bootstrap.Admin/wwwroot/js/Exceptions.js
@@ -44,16 +44,16 @@
             url: Exceptions.url, swal: false,
             callback: function (result) {
                 var html = result.map(function (ele) {
-                    return $.format('<div class="form-group col-lg-3 col-md-3 col-sm-4 col-xs-6 logitem"><a class="logfile" title="{0}" href="#"><i class="fa fa-file-text-o"></i><span>{0}</span></a></div>', ele);
+                    return $.format('<div class="form-group col-lg-3 col-md-3 col-sm-4 col-6"><a class="logfile" data-toggle="tooltip" title="{0}" href="#"><i class="fa fa-file-text-o"></i><span>{0}</span></a></div>', ele);
                 }).join('');
-                $dataForm.children('div').html(html);
+                $dataForm.children('div').html(html).find('[data-toggle="tooltip"]').tooltip();
                 $dialog.modal('show');
             }
         });
     });
 
     $dialog.on('click', 'a', function () {
-        var fileName = $(this).find('span').text();
+        var fileName = $(this).tooltip('hide').find('span').text();
         $errorDetailTitle.text(fileName);
         $errorList.hide();
         $errorDetail.show();
diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
index e5def94b..bf652958 100644
--- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
+++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
@@ -120,7 +120,7 @@
                 contentType: 'application/json',
                 dataType: 'json',
                 method: "post",
-                htmlTemplate: '<div class="form-group col-md-3 col-sm-4 col-6"><div class="form-check"><label class="form-check-label" title="{3}" data-toggle="tooltip"><input type="checkbox" class="form-check-input" value="{0}" {2}/>{1}</label></div></div>',
+                htmlTemplate: '<div class="form-group col-md-3 col-sm-4 col-6"><div class="form-check"><label class="form-check-label" title="{3}" data-toggle="tooltip"><input type="checkbox" class="form-check-input" value="{0}" {2}/><span>{1}</span></label></div></div>',
                 title: "",
                 swal: true,
                 modal: null,