From 3f11ea27789425e34819cb74477115bb4ff9f245 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Sun, 12 Mar 2017 16:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=5FLayout.cshtml=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4Fix.css=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Bootstrap.Admin.csproj      |  1 -
 Bootstrap.Admin/Content/css/fix.css         | 11 -----------
 Bootstrap.Admin/Content/css/site.css        | 12 ++++++++++++
 Bootstrap.Admin/Views/Shared/_Admin.cshtml  |  3 ---
 Bootstrap.Admin/Views/Shared/_Layout.cshtml |  4 +++-
 Bootstrap.Admin/Views/Shared/_Normal.cshtml |  3 ---
 6 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 Bootstrap.Admin/Content/css/fix.css

diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj
index 782261af..aab8226e 100644
--- a/Bootstrap.Admin/Bootstrap.Admin.csproj
+++ b/Bootstrap.Admin/Bootstrap.Admin.csproj
@@ -108,7 +108,6 @@
     <Content Include="Content\css\api.css" />
     <Content Include="Content\css\bootstrap-datetimepicker.css" />
     <Content Include="Content\css\bootstrap-datetimepicker.min.css" />
-    <Content Include="Content\css\fix.css" />
     <Content Include="Content\css\IE8.css" />
     <Content Include="Content\css\nprogress.css" />
     <Content Include="Content\html\api.html" />
diff --git a/Bootstrap.Admin/Content/css/fix.css b/Bootstrap.Admin/Content/css/fix.css
deleted file mode 100644
index 344fe7cf..00000000
--- a/Bootstrap.Admin/Content/css/fix.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.tooltip-inner {
-    max-width: 768px;
-}
-
-.tooltip.has-error .tooltip-inner {
-    background-color: #a94442;
-}
-
-.tooltip.has-error .tooltip-arrow {
-    border-top-color: #a94442;
-}
\ No newline at end of file
diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css
index 768b3712..faf451f6 100644
--- a/Bootstrap.Admin/Content/css/site.css
+++ b/Bootstrap.Admin/Content/css/site.css
@@ -562,3 +562,15 @@ ul.breadcrumb {
     background-image: url('../images/bg.jpg');
     background-size: 100% 100%;
 }
+
+.tooltip-inner {
+    max-width: 768px;
+}
+
+.tooltip.has-error .tooltip-inner {
+    background-color: #a94442;
+}
+
+.tooltip.has-error .tooltip-arrow {
+    border-top-color: #a94442;
+}
diff --git a/Bootstrap.Admin/Views/Shared/_Admin.cshtml b/Bootstrap.Admin/Views/Shared/_Admin.cshtml
index f836c84c..7f5f0d0f 100644
--- a/Bootstrap.Admin/Views/Shared/_Admin.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Admin.cshtml
@@ -2,10 +2,7 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 @section css {
-    <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
-    <link href="~/Content/css/site.css" rel="stylesheet" />
     <link href="~/Content/css/admin.css" rel="stylesheet" />
-    <link href="~/Content/css/site-responsive.css" rel="stylesheet" />
     <link href="~/Content/css/admin-responsive.css" rel="stylesheet" />
     @RenderSection("css", false)
 }
diff --git a/Bootstrap.Admin/Views/Shared/_Layout.cshtml b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
index e4c0a586..f2a6fedd 100644
--- a/Bootstrap.Admin/Views/Shared/_Layout.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
@@ -10,7 +10,9 @@
     <link href="~/Content/css/bootstrap.css" rel="stylesheet">
     <link href="~/Content/css/bootstrap-theme.css" rel="stylesheet">
     <link href="~/Content/css/nprogress.css" rel="stylesheet" />
-    <link href="~/Content/css/fix.css" rel="stylesheet" />
+    <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
+    <link href="~/Content/css/site.css" rel="stylesheet" />
+    <link href="~/Content/css/site-responsive.css" rel="stylesheet" />
     <!--[if lte IE 9 ]>
     <link href="../Content/css/IE8.css" rel="stylesheet" />
     <![endif]-->
diff --git a/Bootstrap.Admin/Views/Shared/_Normal.cshtml b/Bootstrap.Admin/Views/Shared/_Normal.cshtml
index c9c38907..a1a9e48c 100644
--- a/Bootstrap.Admin/Views/Shared/_Normal.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Normal.cshtml
@@ -2,11 +2,8 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 @section css {
-    <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
     <link href="~/Content/css/bootstrap-table.css" rel="stylesheet" />
     <link href="~/Content/css/sweetalert.css" rel="stylesheet" />
-    <link href="~/Content/css/site.css" rel="stylesheet" />
-    <link href="~/Content/css/site-responsive.css" rel="stylesheet" />
     @RenderSection("css", false)
 }
 @section javascript {