From 34bc46450f1c27f4956e7c99f611628ab8608cd0 Mon Sep 17 00:00:00 2001
From: zhangyang <zhangyanggfkd@gmail.com>
Date: Fri, 9 Aug 2013 22:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4header=E7=9A=84=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=EF=BC=9B=E5=B0=86menu=E5=AD=97=E4=BD=93=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=94=B9=E4=B8=BA=E8=93=9D=E8=89=B2=EF=BC=9B=E7=BC=A9?=
 =?UTF-8?q?=E5=B0=8F=E4=B8=BB=E9=A1=B5=E7=99=BB=E5=BD=95=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_header.html.erb                  | 4 ++--
 public/stylesheets/application.css                       | 9 ++++-----
 .../themes/redpenny-master/stylesheets/application.css   | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 69fbab77..16bf7c27 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -1,9 +1,9 @@
-<div id="top-menu" style="background-color: #EEEEEE;height:30px;margin-top: 10px;margin-bottom: 10px;">
+<div id="top-menu" style="background-color: #FFFFFF;height:30px;margin-top: 10px;margin-bottom: 10px;">
 	<div id="account">
 		<%= render_menu :account_menu -%>
 	</div>
 		<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
 		<%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
 </div>
-<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;"></div>
+<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e27baa66..3b980fff 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -786,7 +786,7 @@ div.square {
 
 .splitcontent {overflow:auto;}
 .splitcontentleft{float:left; width:49%;}
-/*by young*/
+/*Added by young*/
 
 .hotlist {
 padding:0 15px 25px;
@@ -846,15 +846,14 @@ margin-left:-10px;
 }
 
 #header a {font-family: Verdana, sans-serif; font-size: 12px; color:#808080;}
-#login-form_new table
+#login-form_new table/*Added by young*/
 {
 	padding:20px 25px;
 	background:#fff;
 	text-align:left;
 
-	width:380px;
 	margin-top: 50px;	
-	width:310px;
+	width:280px;
 	
 	font-family:微软雅黑,lucida grande,verdana;
 	font-size:12px;
@@ -865,7 +864,7 @@ margin-left:-10px;
 	-webkit-box-shadow:0 0 6px #039ea0;
 	box-shadow:0 0 6px #039ea0;
 	border:1px solid #AAA;
-	margin-left: 500px;
+	margin-left: 600px;
 }
 /*end*/
 .splitcontentright{float:right; width:49%;}
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index a5bcab08..d4f6ec1a 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -387,8 +387,8 @@ ul.projects li.root
 
 #top-menu li a
 {
-	/*by young*/
-	color:#AAAAAA; 
+	/*Modified by young*/
+	color:#00AAF8; 
 	font-weight:6px;
 	padding:4px 5px
 }