From 95c155ae65a143b227bbfabf710ca1a5d371bf1a Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Sun, 20 Nov 2016 20:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E8=84=9A=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Content/css/admin-responsive.css | 11 +++++++++++
 Bootstrap.Admin/Content/css/site-responsive.css  | 16 ----------------
 Bootstrap.Admin/Content/css/site.css             |  9 +++++++++
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Bootstrap.Admin/Content/css/admin-responsive.css b/Bootstrap.Admin/Content/css/admin-responsive.css
index 8be5dc59..a3d371ef 100644
--- a/Bootstrap.Admin/Content/css/admin-responsive.css
+++ b/Bootstrap.Admin/Content/css/admin-responsive.css
@@ -49,6 +49,10 @@
         white-space: nowrap;
         text-overflow: ellipsis;
     }
+
+    .site-footer {
+        position: relative;
+    }
 }
 
 @media (max-width: 548px) {
@@ -112,6 +116,13 @@
         position: absolute;
         overflow-y: auto;
     }
+
+    .site-footer {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        right: 0;
+    }
 }
 
 @media (min-height: 568px) {
diff --git a/Bootstrap.Admin/Content/css/site-responsive.css b/Bootstrap.Admin/Content/css/site-responsive.css
index 3a8f8025..d5be183a 100644
--- a/Bootstrap.Admin/Content/css/site-responsive.css
+++ b/Bootstrap.Admin/Content/css/site-responsive.css
@@ -47,14 +47,6 @@
         z-index: 50;
     }
 
-    .site-footer {
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        right: 0;
-        z-index: 50;
-    }
-
     #main-content {
         margin-top: 0;
         position: fixed;
@@ -80,14 +72,6 @@
         z-index: 50;
     }
 
-    .site-footer {
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        right: 0;
-        z-index: 50;
-    }
-
     #main-content {
         margin-top: 0;
         position: fixed;
diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css
index 40a49711..a6f3bc38 100644
--- a/Bootstrap.Admin/Content/css/site.css
+++ b/Bootstrap.Admin/Content/css/site.css
@@ -67,6 +67,15 @@ a, a:hover, a:focus {
     padding: 10px 4px;
     height: 40px;
 }
+
+.site-footer {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 50;
+}
+
 /*end title*/
 
 .go-top {