From 2e333dd7bbd22521007db61cd6dbf59f67097881 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Mon, 21 Nov 2016 01:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=9B=BE=E6=A0=87=E9=A1=B5=E9=9D=A2=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E4=B8=AA=E9=9D=A2=E6=9D=BF=E6=BF=80=E6=B4=BB=E6=97=B6=E5=8F=B3?=
 =?UTF-8?q?=E8=BE=B9=E5=BF=AB=E6=8D=B7=E6=8C=87=E7=A4=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E9=9A=90=E8=97=8F=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Content/css/fa.css            | 28 +++++++++++++------
 .../Controllers/AdminController.cs            |  4 +--
 Bootstrap.Admin/Scripts/icon.js               |  9 ++++++
 Bootstrap.Admin/Views/Admin/FAIcon.cshtml     | 22 +++++++++------
 Bootstrap.Admin/Views/Shared/IconView.cshtml  |  2 +-
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/Bootstrap.Admin/Content/css/fa.css b/Bootstrap.Admin/Content/css/fa.css
index c532c326..c3d6e5e0 100644
--- a/Bootstrap.Admin/Content/css/fa.css
+++ b/Bootstrap.Admin/Content/css/fa.css
@@ -1,9 +1,4 @@
-body {
-    font-family: 'Open Sans', sans-serif;
-    font-size: 13px;
-}
-
-.modal-body #fa-top {
+.modal-body #fa-top {
     float: left;
     margin-top: -15px;
 }
@@ -30,9 +25,9 @@
 
 .fb-timeliner {
     position: fixed;
-    top: 80px;
-    right: 40px;
-    width: 150px;
+    top: 96px;
+    right: 46px;
+    width: 140px;
     bottom: 100px;
 }
 
@@ -177,6 +172,7 @@
         padding-bottom: 4px;
         height: 32px;
         vertical-align: middle;
+        color: #222;
     }
 
         .fontawesome-icon-list ul li:hover {
@@ -211,3 +207,17 @@
     .menu-content .dd {
         max-width: inherit;
     }
+
+.faicon {
+    padding-bottom: 15px;
+}
+
+    .faicon .fb-timeliner {
+        top: 130px;
+        right: 32px;
+        bottom: 70px;
+    }
+
+    .faicon .nav-tabs > li.active > a, .faicon .nav-tabs > li.active > a:hover, .faicon .nav-tabs > li.active > a:focus {
+        background-color: #41CAC0;
+    }
diff --git a/Bootstrap.Admin/Controllers/AdminController.cs b/Bootstrap.Admin/Controllers/AdminController.cs
index a8cd517e..59e497f0 100644
--- a/Bootstrap.Admin/Controllers/AdminController.cs
+++ b/Bootstrap.Admin/Controllers/AdminController.cs
@@ -75,10 +75,10 @@ namespace Bootstrap.Admin.Controllers
         /// 
         /// </summary>
         /// <returns></returns>
-        [AllowAnonymous]
         public ActionResult FAIcon()
         {
-            return View();
+            var v = new NavigatorBarModel("~/Admin/FAIcon");
+            return View(v);
         }
         /// <summary>
         /// 
diff --git a/Bootstrap.Admin/Scripts/icon.js b/Bootstrap.Admin/Scripts/icon.js
index a9071b79..29d47332 100644
--- a/Bootstrap.Admin/Scripts/icon.js
+++ b/Bootstrap.Admin/Scripts/icon.js
@@ -1,5 +1,8 @@
 $(function () {
     var $iconList = $('#iconTab').find('div.fontawesome-icon-list');
+    var $main = $('#main-content');
+    var $tl = $('#timeline');
+
     $iconList.on('click', 'a', function () {
         window.console.log($(this).children('i').attr('class'));
         return false;
@@ -10,4 +13,10 @@
     });
     $iconList.find('ul li').addClass('col-md-3 col-sm-4 col-xs-6');
     $iconList.find('div').addClass('col-xs-6');
+
+    $main.scrollspy({ offset: 150, target: '#timeline' });
+    $('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
+        if (e.target.href.indexOf("#Glyphicons") > -1) $tl.attr('style', 'display: none;');
+        else $tl.removeAttr('style');
+    })
 });
\ No newline at end of file
diff --git a/Bootstrap.Admin/Views/Admin/FAIcon.cshtml b/Bootstrap.Admin/Views/Admin/FAIcon.cshtml
index 55b047d3..14c233fb 100644
--- a/Bootstrap.Admin/Views/Admin/FAIcon.cshtml
+++ b/Bootstrap.Admin/Views/Admin/FAIcon.cshtml
@@ -1,17 +1,21 @@
-@{
-    ViewBag.Title = "Icon";
-    Layout = "~/Views/Shared/_Layout.cshtml";
+@model NavigatorBarModel
+@{
+    ViewBag.Title = "图标集";
+    Layout = "~/Views/Shared/_Admin.cshtml";
 }
 @section css {
     <link href="~/Content/css/fa.css" rel="stylesheet" />
     <link href="~/Content/css/fa.responsive.css" rel="stylesheet" />
-    <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
 }
 @section javascript {
     <script src="~/Scripts/icon.js"></script>
 }
-<section class="container">
-    <div class="panel-body" data-spy="scroll" data-target=".fb-timeliner">
-        @Html.Partial("IconView")
-    </div>
-</section>
\ No newline at end of file
+@section header {
+    @Html.Partial("Header", Model)
+}
+@section navigator {
+    @Html.Partial("Navigator", Model)
+}
+<div class="faicon">
+    @Html.Partial("IconView")
+</div>
diff --git a/Bootstrap.Admin/Views/Shared/IconView.cshtml b/Bootstrap.Admin/Views/Shared/IconView.cshtml
index 1d538e9f..9bbe25ee 100644
--- a/Bootstrap.Admin/Views/Shared/IconView.cshtml
+++ b/Bootstrap.Admin/Views/Shared/IconView.cshtml
@@ -9,7 +9,7 @@
         <div role="tabpanel" class="tab-pane" id="Glyphicons">@Html.Partial("Glyphicons")</div>
     </div>
 </div>
-<div class="fb-timeliner">
+<div id="timeline" class="fb-timeliner">
     <h2 class="recent-highlight">图标分类</h2>
     <ul class="nav navbar">
         <li><a href="#new">新图标</a></li>