From 4703ecf4f5083a526352677af5b89adf7ed89dbb Mon Sep 17 00:00:00 2001
From: sunnian <853128958@qq.com>
Date: Fri, 28 Oct 2016 19:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E9=80=89=E6=8B=A9=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Content/css/fa.css            |  2 ++
 .../Views/Shared/AwesomeIcon.cshtml           | 24 +++++++++----------
 Bootstrap.Admin/Views/Shared/IconView.cshtml  | 23 +++++++++++-------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Bootstrap.Admin/Content/css/fa.css b/Bootstrap.Admin/Content/css/fa.css
index bc70d09a..64cec1fe 100644
--- a/Bootstrap.Admin/Content/css/fa.css
+++ b/Bootstrap.Admin/Content/css/fa.css
@@ -17,7 +17,9 @@
 .fb-timeliner {
     position: fixed;
     right: 40px;
+    height:70%;
     width: 150px;
+    overflow-y:auto;
 }
 
     .fb-timeliner ul {
diff --git a/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml b/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml
index 0f1c38d4..65aad0cf 100644
--- a/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml
+++ b/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml
@@ -1051,7 +1051,7 @@
 </section>
 
 <section id="gender">
-    <h2 class="page-header">Gender Icons</h2>
+    <h2 class="page-header">性别图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1090,7 +1090,7 @@
 </section>
 
 <section id="file-type">
-    <h2 class="page-header">File Type Icons</h2>
+    <h2 class="page-header">文件类型图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1137,7 +1137,7 @@
 </section>
 
 <section id="spinner">
-    <h2 class="page-header">Spinner Icons</h2>
+    <h2 class="page-header">微调控制项图标</h2>
 
     <div class="alert alert-success">
         <ul class="fa-ul">
@@ -1168,7 +1168,7 @@
 </section>
 
 <section id="form-control">
-    <h2 class="page-header">Form Control Icons</h2>
+    <h2 class="page-header">格式控制图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1200,7 +1200,7 @@
 </section>
 
 <section id="payment">
-    <h2 class="page-header">Payment Icons</h2>
+    <h2 class="page-header">支付图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1235,7 +1235,7 @@
 </section>
 
 <section id="chart">
-    <h2 class="page-header">Chart Icons</h2>
+    <h2 class="page-header">图表图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1256,7 +1256,7 @@
 </section>
 
 <section id="currency">
-    <h2 class="page-header">Currency Icons</h2>
+    <h2 class="page-header">货币图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1319,7 +1319,7 @@
 </section>
 
 <section id="text-editor">
-    <h2 class="page-header">Text Editor Icons</h2>
+    <h2 class="page-header">文本编辑图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1428,7 +1428,7 @@
 </section>
 
 <section id="directional">
-    <h2 class="page-header">Directional Icons</h2>
+    <h2 class="page-header">方向图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1545,7 +1545,7 @@
 </section>
 
 <section id="video-player">
-    <h2 class="page-header">Video Player Icons</h2>
+    <h2 class="page-header">影像播放器图标</h2>
 
     <div class="row fontawesome-icon-list">
 
@@ -1598,7 +1598,7 @@
 </section>
 
 <section id="brand">
-    <h2 class="page-header">Brand Icons</h2>
+    <h2 class="page-header">品牌图标</h2>
 
     <div class="alert alert-warning">
         <h4><i class="fa fa-warning" aria-hidden"true"=""></i> Warning!</h4>
@@ -1978,7 +1978,7 @@
 </section>
 
 <section id="medical">
-    <h2 class="page-header">Medical Icons</h2>
+    <h2 class="page-header">医疗图标</h2>
 
     <div class="row fontawesome-icon-list">
 
diff --git a/Bootstrap.Admin/Views/Shared/IconView.cshtml b/Bootstrap.Admin/Views/Shared/IconView.cshtml
index fdf1ee9b..8c23ce1d 100644
--- a/Bootstrap.Admin/Views/Shared/IconView.cshtml
+++ b/Bootstrap.Admin/Views/Shared/IconView.cshtml
@@ -18,17 +18,22 @@
         <div class="fb-timeliner">
             <h2 class="recent-highlight">图标分类</h2>
             <ul>
-                <li class="active"><a href="#">类型一</a></li>
                 <li><a href="#new">新图标</a></li>
                 <li><a href="#web-application">Web 图标</a></li>
-                <li><a href="#accessibility">accessibility</a></li>
-                <li><a href="#transportation">transportation</a></li>
-                <li><a href="#gender">gender</a></li>
-                <li><a href="#">类型一</a></li>
-                <li><a href="#">类型一</a></li>
-                <li><a href="#">类型一</a></li>
-                <li><a href="#">类型一</a></li>
-                <li><a href="#">类型一</a></li>
+                <li><a href="#accessibility">辅助图标</a></li>
+                <li><a href="#hand">手形图标</a></li>
+                <li><a href="#transportation">交通运输图标</a></li>
+                <li><a href="#gender">性别图标</a></li>
+                <li><a href="#file-type">文件类型图标</a></li>
+                <li><a href="#spinner">微调控制项图标</a></li>
+                <li><a href="#form-control">格式控制图标</a></li>
+                <li><a href="#payment">支付图标</a></li>
+                <li><a href="#chart">图表图标</a></li>
+                <li><a href="#currency">货币图标</a></li>
+                <li><a href="#text-editor">文本编辑图标</a></li>
+                <li><a href="#directional">方向图标</a></li>
+                <li><a href="#video-player">影像播放器图标</a></li>
+                <li><a href="#brand">品牌图标</a></li>
                 <li><a href="#medical">医疗图标</a></li>
                 <li><a href="#fa-top">返回顶部</a></li>
                 <li><a href="#fa-bottom">返回底部</a></li>