From 02bea996469094a01c77235b58785714637a4143 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Thu, 5 Dec 2013 17:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb    | 3 +--
 app/views/welcome/index.html.erb | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index b9192f47b..b2f5aeb9b 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -200,6 +200,5 @@ module WelcomeHelper
     event.event_type
     end
   end
-  
-  
+
 end
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 2bba8e495..bf9424a97 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,6 +1,6 @@
 <!--add by huang-->
-<div style="height:280px;">
-	<div class="welcome_left">
+<div style="height:220px;">
+	<div class="welcome_left" style="margin-top: 60px">
 		<table width="388px">
 			<tr><td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td></tr>			
 		</table>
@@ -8,7 +8,7 @@
 	<table>
 		<tr>
 			<td> <%= call_hook :view_account_login_top %>
-			<div id="login-form_new">
+			<div id="login-form_new" style="margin-top: -20px;">
 				<%= form_tag(signin_path) do %>
 					<%= back_url_hidden_field_tag if is_logout? %>
 					<% unless User.current.logged? %> <!--modified by young-->