From a66b755aa3327acd024db892e2e616be707646f1 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Fri, 7 Aug 2015 17:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20footer=20=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/css/global.css | 16 ++++++++++++++--
 static/src/css/oj.css     |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/static/src/css/global.css b/static/src/css/global.css
index edc04a7a..c55a0bb3 100644
--- a/static/src/css/global.css
+++ b/static/src/css/global.css
@@ -1,3 +1,16 @@
+html{
+    height: 100%;
+}
+
+body{
+    height:100%; /*使内容高度和body一样*/
+    margin-bottom:-80px;/*向上缩减80像素，不至于footer超出屏幕可视范围*/
+}
+
+.main{
+    padding-bottom: 120px;
+}
+
 img {
     max-width: 100%;
     height: auto;
@@ -6,8 +19,7 @@ img {
 .footer {
     left: 0;
     right: 0;
-    position: absolute;
-    bottom: 30px;
+    height: 80px
 }
 
 label {
diff --git a/static/src/css/oj.css b/static/src/css/oj.css
index 5e1bfc5d..cc6ac62d 100644
--- a/static/src/css/oj.css
+++ b/static/src/css/oj.css
@@ -1,3 +1,4 @@
+@import url("global.css");
 @import url("bootstrap/bootstrap.min.css");
 @import url("bootstrap/todc-bootstrap.min.css");
 @import url("codeMirror/codemirror.css");