From c4da68cf48e18e3cc9b90f1f706e1d2c5bd9ab3c Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Thu, 2 Aug 2018 19:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9Settings=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Settings.cshtml  | 42 ++++++++++----------
 Bootstrap.Admin/Views/Shared/Header.cshtml   | 10 ++---
 Bootstrap.Admin/wwwroot/css/admin.css        |  2 +-
 Bootstrap.Admin/wwwroot/css/site.css         |  5 ++-
 Bootstrap.Admin/wwwroot/js/Content.js        |  1 -
 Bootstrap.Admin/wwwroot/js/Longbow.Common.js |  4 +-
 Bootstrap.Admin/wwwroot/js/Settings.js       |  2 +-
 7 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/Bootstrap.Admin/Views/Admin/Settings.cshtml
index 1cb397a8..fc316a1c 100644
--- a/Bootstrap.Admin/Views/Admin/Settings.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Settings.cshtml
@@ -22,10 +22,12 @@
 <div class="card">
     <div class="card-header">系统名称设置</div>
     <div class="card-body" data-toggle="LgbValidate" data-valid-button="#sysSave">
-        <div class="input-group form-group col-xs-12">
-            <input type="text" class="form-control" id="sysName" placeholder="请输入网站标题，50字以内" value="@Model.Title" maxlength="50" data-valid="true" />
-            <div class="input-group-append">
-                <button class="btn btn-secondary" type="button" data-method="title">保存</button>
+        <div class="form-group">
+            <div class="input-group">
+                <input type="text" class="form-control" id="sysName" placeholder="请输入网站标题，50字以内" value="@Model.Title" maxlength="50" data-valid="true" />
+                <div class="input-group-append">
+                    <button class="btn btn-secondary" type="button" data-method="title">保存</button>
+                </div>
             </div>
         </div>
     </div>
@@ -33,10 +35,12 @@
 <div class="card">
     <div class="card-header">页脚设置</div>
     <div class="card-body" data-toggle="LgbValidate" data-valid-button="#footSave">
-        <div class="input-group form-group col-xs-12">
-            <input type="text" class="form-control" id="sysFoot" placeholder="请输入网站页脚，50字以内" value="@Model.Footer" maxlength="50" data-valid="true" />
-            <div class="input-group-append">
-                <button class="btn btn-secondary" type="button" data-method="footer">保存</button>
+        <div class="form-group">
+            <div class="input-group">
+                <input type="text" class="form-control" id="sysFoot" placeholder="请输入网站页脚，50字以内" value="@Model.Footer" maxlength="50" data-valid="true" />
+                <div class="input-group-append">
+                    <button class="btn btn-secondary" type="button" data-method="footer">保存</button>
+                </div>
             </div>
         </div>
     </div>
@@ -45,19 +49,17 @@
     <div class="card-header">网站样式</div>
     <div class="card-body">
         <form id="CssDataForm" class="form-inline">
-            <div class="form-row">
-                <div class="form-group col-xs-12">
-                    <div class="dropdown lgbDropdown">
-                        <a id="dictCssDefine" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-default-val="">
-                            <span>默认样式</span>
-                            <span class="caret"></span>
-                        </a>
-                        <ul class="dropdown-menu" role="menu" id="cssContainer">
-                            <li><a href="#" data-val="">默认样式</a></li>
-                        </ul>
-                    </div>
-                    <button class="btn btn-secondary" type="button" data-method="css">保存</button>
+            <div class="form-group">
+                <div class="dropdown lgbDropdown">
+                    <button id="dictCssDefine" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-default-val="">
+                        <span>默认样式</span>
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" role="menu" id="cssContainer">
+                        <li><a href="#" data-val="">默认样式</a></li>
+                    </ul>
                 </div>
+                <button class="btn btn-secondary" type="button" data-method="css">保存</button>
             </div>
         </form>
     </div>
diff --git a/Bootstrap.Admin/Views/Shared/Header.cshtml b/Bootstrap.Admin/Views/Shared/Header.cshtml
index cd5fd106..e8300c5e 100644
--- a/Bootstrap.Admin/Views/Shared/Header.cshtml
+++ b/Bootstrap.Admin/Views/Shared/Header.cshtml
@@ -11,7 +11,7 @@
         <ul class="notify-row">
             <!-- tasks start -->
             <li class="dropdown">
-                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                <a data-toggle="dropdown" href="#">
                     <i class="fa fa-tasks"></i>
                     <span id="msgHeaderTaskBadge" class="badge bg-success"></span>
                 </a>
@@ -28,7 +28,7 @@
             <!-- tasks end -->
             <!-- message dropdown start-->
             <li class="dropdown">
-                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                <a data-toggle="dropdown" href="#">
                     <i class="fa fa-envelope"></i>
                     <span id="msgHeaderMsgBadge" class="badge bg-important"></span>
                 </a>
@@ -45,7 +45,7 @@
             <!-- message dropdown end -->
             <!-- users dropdown start-->
             <li class="dropdown">
-                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                <a data-toggle="dropdown" href="#">
                     <i class="fa fa-user-plus"></i>
                     <span id="msgHeaderUserBadge" class="badge bg-user"></span>
                 </a>
@@ -62,7 +62,7 @@
             <!-- users dropdown end -->
             <!-- apps dropdown start-->
             <li class="dropdown">
-                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                <a data-toggle="dropdown" href="#">
                     <i class="fa fa-bug"></i>
                     <span id="msgHeaderAppBadge" class="badge bg-warning"></span>
                 </a>
@@ -79,7 +79,7 @@
             <!-- apps dropdown end -->
             <!-- db dropdown start-->
             <li class="dropdown">
-                <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+                <a data-toggle="dropdown" href="#">
                     <i class="fa fa-database"></i>
                     <span id="msgHeaderDbBadge" class="badge bg-db"></span>
                 </a>
diff --git a/Bootstrap.Admin/wwwroot/css/admin.css b/Bootstrap.Admin/wwwroot/css/admin.css
index 5818200b..6a87d307 100644
--- a/Bootstrap.Admin/wwwroot/css/admin.css
+++ b/Bootstrap.Admin/wwwroot/css/admin.css
@@ -55,7 +55,7 @@
 
 
 .modal-dialog .modal-body, .card-body {
-    padding-bottom: 0;
+    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"] {
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index 7060b417..362eb8d4 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -32,12 +32,12 @@ a, a:hover, a:focus {
 .dropdown-menu {
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.176);
     padding: 0;
-    margin-top: 1rem;
     font-size: 0.875rem;
 }
 
     .dropdown-menu > li > a {
         padding: 6px 20px;
+        display: block;
     }
 
     .dropdown-menu .divider {
@@ -101,6 +101,7 @@ a, a:hover, a:focus {
 
         .header > .dropdown .dropdown-menu {
             width: 268px;
+            margin-top: 10px;
         }
 
             .header > .dropdown .dropdown-menu li {
@@ -248,7 +249,7 @@ a, a:hover, a:focus {
             .notify-row > li > a .badge {
                 position: absolute;
                 top: -14px;
-                left: 38px;
+                left: 24px;
                 z-index: 1;
                 opacity: 0.8;
             }
diff --git a/Bootstrap.Admin/wwwroot/js/Content.js b/Bootstrap.Admin/wwwroot/js/Content.js
index 0f31a842..0ac74b2e 100644
--- a/Bootstrap.Admin/wwwroot/js/Content.js
+++ b/Bootstrap.Admin/wwwroot/js/Content.js
@@ -1,4 +1,3 @@
 $(function () {
-    $('#navbar').attr('data-toggle', "dropdown").addClass('dropdown-toggle');
     $('#breadNav').hide();
 });
\ No newline at end of file
diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
index 68d5abbb..e7ba7749 100644
--- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
+++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
@@ -421,7 +421,7 @@
             var op = typeof options === 'object' && options;
             if (/val/.test(options)) {
                 if (arguments.length === 1)
-                    return $this.first().children('a').val();
+                    return $this.first().children('button').attr("data-val");
                 else {
                     $this.first().children(':first').children(':first').text($this.find('[data-val="' + arguments[1] + '"]').text());
                 }
@@ -431,7 +431,7 @@
                     $(this).on('click', '.dropdown-menu a', { $parent: $(this) }, function (event) {
                         event.preventDefault();
                         var $op = $(this);
-                        event.data.$parent.children('a').val($op.attr('data-val')).children(':first').text($op.text());
+                        event.data.$parent.children('button').attr('data-val', $op.attr('data-val')).children(':first').text($op.text());
                     });
                 });
             }
diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js
index 8ee01b36..b028736d 100644
--- a/Bootstrap.Admin/wwwroot/js/Settings.js
+++ b/Bootstrap.Admin/wwwroot/js/Settings.js
@@ -36,7 +36,7 @@
                 });
                 break;
             case 'css':
-                var cssDefine = $('#dictCssDefine').val();
+                var cssDefine = $('#dictCssDefine').attr("data-val");
                 $.bc({
                     url: Settings.url, data: { name: '使用样式', code: cssDefine, category: '当前样式' }, title: '网站样式',
                     callback: function (result) {