From 20e95d2faaa21c1aca530215add68b4265ca9dd8 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Thu, 6 Mar 2014 03:37:30 +0000
Subject: [PATCH] =?UTF-8?q?=09=E6=9B=B4=E6=96=B0=E9=A1=B5=E8=84=9A?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/style.css           |  6 ++++--
 public/sjyportal/css/style.css | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 3942f6f7..1035cd05 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -4,6 +4,8 @@ body{padding-top:60px;}
 
 .manager-view .panel{overflow:hidden}
 
-footer{text-align:center;}
+footer{
+	text-align:center;
+
+	}
 
-.pagebody{overflow:hidden;}
\ No newline at end of file
diff --git a/public/sjyportal/css/style.css b/public/sjyportal/css/style.css
index 281aba95..38a85e96 100644
--- a/public/sjyportal/css/style.css
+++ b/public/sjyportal/css/style.css
@@ -78,16 +78,16 @@ body {
 /*   */
 /*  */  
 #logo, #search {
-	margin-right: 20px;
+	margin-right: 0px;
 }
 
 .container .row-fluid .span12 .span9 .nav {
 	float: right;
-	padding-top: 15px;
+	padding-top: 0px;
 }
 
 .container .span12 .row .span8 .nav {
-	padding-top: 20px;
+	padding-top: 0px;
 }
 .box {
 	border: 1px solid #EFEFEF;
@@ -132,14 +132,14 @@ body {
 }
 /* Downsize the brand/project name a bit */
 .navbar .brand {
-	padding: 14px 20px 16px; /* Increase vertical padding to match navbar links */
+ /* Increase vertical padding to match navbar links */
 	font-size: 16px;
 	font-weight: bold;
 	text-shadow: 0 -1px 0 rgba(0,0,0,.5);
 }
 /* Navbar links: increase padding for taller navbar */
 .navbar .nav > li > a {
-	padding: 15px 20px;
+	padding: 0px 0px;
 }
 /* CUSTOMIZE THE CAROUSEL
     -------------------------------------------------- */