From bb82b88756abe5c1fe9c86571dd2209dad1f1936 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Mon, 7 Nov 2016 17:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A6=E4=BE=A7=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=B8=8E=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?Bar=E5=90=88=E5=B9=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Content/css/site-responsive.css           | 22 ++++++++++-------
 Bootstrap.Admin/Content/css/site.css          | 24 ++++++++-----------
 Bootstrap.Admin/Content/js/Longbow.Common.js  |  5 ++++
 Bootstrap.Admin/Content/js/common-scripts.js  |  2 +-
 Bootstrap.Admin/Views/Shared/Header.cshtml    | 10 ++++----
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Bootstrap.Admin/Content/css/site-responsive.css b/Bootstrap.Admin/Content/css/site-responsive.css
index 743940ab..b859cf4e 100644
--- a/Bootstrap.Admin/Content/css/site-responsive.css
+++ b/Bootstrap.Admin/Content/css/site-responsive.css
@@ -46,10 +46,6 @@
         margin: 0px !important;
     }
 
-    .logo {
-        display: none;
-    }
-
     .fb-timeliner {
         display: none;
     }
@@ -70,10 +66,22 @@
     }
 }
 
-@media (max-width: 480px) {
+@media (max-width: 666px) {
     .notify-row {
         display: none;
     }
+}
+
+@media (max-width: 548px) {
+    .top-menu .search {
+        display: none;
+    }
+}
+
+@media (max-width: 480px) {
+    .sidebar-toggle-box span, .notify-row {
+        display: none;
+    }
 
     .modal-dialog {
         width: 370px;
@@ -82,10 +90,6 @@
     .top-menu > li {
         float: right;
     }
-
-    .top-menu .search {
-        display: none;
-    }
 }
 
 @media (max-width: 320px) {
diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css
index ecb3cebd..4aaab3d7 100644
--- a/Bootstrap.Admin/Content/css/site.css
+++ b/Bootstrap.Admin/Content/css/site.css
@@ -61,7 +61,6 @@ div button span {
     border-bottom: 1px solid #f1f2f7;
 }
 
-
 .arrow-up {
     background: url("../images/arrow-up.png") no-repeat;
     width: 20px;
@@ -72,29 +71,24 @@ div button span {
 }
 
 /*Title*/
-a.logo {
+.sidebar-toggle-box {
+    margin-top: 20px;
     font-size: 21px;
-    color: #2e2e2e;
+    color: #333;
     float: left;
     margin-top: 15px;
     text-transform: uppercase;
 }
 
-    a.logo:hover, a.logo:focus {
+    .sidebar-toggle-box:hover, .sidebar-toggle-box:focus {
         text-decoration: none;
         outline: none;
+        color: #337ab7;
     }
 
-    a.logo span {
-        color: #FF6C60;
+    .sidebar-toggle-box span {
+        padding-left: 6px;
     }
-/*end title*/
-
-.sidebar-toggle-box {
-    float: left;
-    padding-right: 15px;
-    margin-top: 20px;
-}
 
     .sidebar-toggle-box .fa-bars {
         cursor: pointer;
@@ -108,6 +102,7 @@ a.logo {
     padding: 10px 4px;
     height: 40px;
 }
+/*end title*/
 
 .go-top {
     margin-right: 1%;
@@ -280,7 +275,8 @@ a.logo {
 /*notify bar*/
 .notify-row {
     margin-top: 20px;
-    float: left;
+    padding-left: 20px;
+    display: inline-block;
 }
 
     .notify-row > li {
diff --git a/Bootstrap.Admin/Content/js/Longbow.Common.js b/Bootstrap.Admin/Content/js/Longbow.Common.js
index e7a46ecc..b0fd2225 100644
--- a/Bootstrap.Admin/Content/js/Longbow.Common.js
+++ b/Bootstrap.Admin/Content/js/Longbow.Common.js
@@ -189,4 +189,9 @@ $(function () {
     });
 
     $('.site-footer div span').text($('#footer').val());
+
+    $('.sidebar-toggle-box').click(function () {
+        window.console.log('1');
+        $(this).next('a').toggle();
+    });
 });
\ No newline at end of file
diff --git a/Bootstrap.Admin/Content/js/common-scripts.js b/Bootstrap.Admin/Content/js/common-scripts.js
index 26b96dbf..89dab3a9 100644
--- a/Bootstrap.Admin/Content/js/common-scripts.js
+++ b/Bootstrap.Admin/Content/js/common-scripts.js
@@ -42,7 +42,7 @@ $(function () {
             $("#sidebar").scrollTo("+=" + Math.abs(diff), 500);
     });
 
-    $('.fa-bars').click(function () {
+    $('.sidebar-toggle-box').click(function () {
 
         if ($('#sidebar > ul').is(":visible") === true) {
             $('#main-content').css({
diff --git a/Bootstrap.Admin/Views/Shared/Header.cshtml b/Bootstrap.Admin/Views/Shared/Header.cshtml
index 0cbabaf1..156bf4b3 100644
--- a/Bootstrap.Admin/Views/Shared/Header.cshtml
+++ b/Bootstrap.Admin/Views/Shared/Header.cshtml
@@ -1,11 +1,11 @@
 @model Bootstrap.Admin.Models.HeaderBarModel
 <!--header start-->
 <header class="header white-bg">
-    <div class="sidebar-toggle-box">
-        <div class="fa fa-bars tooltips" data-placement="right" data-original-title="展开/收起 导航条"></div>
-    </div>
-    <!--logo start-->
-    <a href="#" data-toggle="dropdown" class="logo dropdown-toggle">@Model.Title</a>
+    <a href="#" data-toggle="dropdown" class="sidebar-toggle-box dropdown-toggle">
+        <i class="fa fa-bars"></i>
+        <!--logo start-->
+        <span>@Model.Title</span>
+    </a>
     <!--logo end-->
     @if (Model.Menus.Count() > 0 && Model.ShowMenu)
     {