From db535b6e31ba73a8a4eb0214f5d86a02732f7aa9 Mon Sep 17 00:00:00 2001
From: sunnian <853128958@qq.com>
Date: Sat, 29 Oct 2016 13:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E8=8F=9C=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=AA=97=E5=8F=A3=E5=90=8D=E7=A7=B0=E3=80=81=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=9B=BE=E6=A0=87=E9=A1=B5=E9=9D=A2=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Menus.cshtml      |  2 +-
 .../Views/Shared/AwesomeIcon.cshtml           | 30 -------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index 76e6c44c..bf89c9b9 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -38,7 +38,7 @@
 @section modal {
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="myModalLabel">用户编辑窗口</h4>
+        <h4 class="modal-title" id="myModalLabel">菜单编辑窗口</h4>
     </div>
     <div class="modal-body">
         <form class="form-inline" id="dataForm" name="dataForm" role="form">
diff --git a/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml b/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml
index 65aad0cf..b1c4920a 100644
--- a/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml
+++ b/Bootstrap.Admin/Views/Shared/AwesomeIcon.cshtml
@@ -1139,21 +1139,8 @@
 <section id="spinner">
     <h2 class="page-header">微调控制项图标</h2>
 
-    <div class="alert alert-success">
-        <ul class="fa-ul">
-            <li>
-                <i class="fa fa-info-circle fa-lg fa-li" aria-hidden="true"></i>
-                <strong class="sr-only">Note:</strong>
-                These icons work great with the <code>fa-spin</code> class. Check out the
-                <a href="../examples/#animated" class="alert-link">spinning icons example</a>.
-            </li>
-        </ul>
-    </div>
-
     <div class="row fontawesome-icon-list">
 
-
-
         <div class="fa-hover col-md-3 col-sm-4"><a href="../icon/circle-o-notch"><i class="fa fa-circle-o-notch" aria-hidden="true"></i> <span class="sr-only">Example of </span>circle-o-notch</a></div>
 
         <div class="fa-hover col-md-3 col-sm-4"><a href="../icon/cog"><i class="fa fa-cog" aria-hidden="true"></i> <span class="sr-only">Example of </span>cog</a></div>
@@ -1600,15 +1587,6 @@
 <section id="brand">
     <h2 class="page-header">品牌图标</h2>
 
-    <div class="alert alert-warning">
-        <h4><i class="fa fa-warning" aria-hidden"true"=""></i> Warning!</h4>
-        Apparently, Adblock Plus can remove Font Awesome brand icons with their "Remove Social
-        Media Buttons" setting. We will not use hacks to force them to display. Please
-        <a href="https://adblockplus.org/en/bugs" class="alert-link">report an issue with Adblock Plus</a> if you believe this to be
-        an error. To work around this, you'll need to modify the social icon class names.
-
-    </div>
-
     <div class="row fontawesome-icon-list margin-bottom-lg">
 
 
@@ -1967,14 +1945,6 @@
 
     </div>
 
-    <div class="alert alert-success">
-        <ul class="margin-bottom-none padding-left-lg">
-            <li>All brand icons are trademarks of their respective owners.</li>
-            <li>The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa.</li>
-            <li>Brand icons should only be used to represent the company or product to which they refer.</li>
-        </ul>
-
-    </div>
 </section>
 
 <section id="medical">