From 832e075d580f05d196cbf11c850ccabb1e540a51 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Thu, 22 Aug 2013 22:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb   | 10 +++++-----
 config/locales/en.yml              |  3 ++-
 config/locales/zh.yml              |  4 +++-
 public/stylesheets/application.css |  6 +++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 3004ad06e..fb755f939 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -137,15 +137,15 @@ software development and software crowdsourcing.</td></tr>
 <!--add by huang-->
 
 <!--add by huang-->
-<div style="height:250px;">
+<div style="height:220px;">
 	<div class="welcone_left">
-		<table width="350px">
+		<table width="400px">
 			<tr>
-				<td><span class="font_welcome_trustie">Trustie</span><span class="font_welcome_Cdescription">，面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、软件开发和众包平台。</span></td>
+				<td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %></span><span class="font_welcome_Cdescription">,<%= l(:label_welcome_trustie_description) %></span></td>
 			</tr>
-			<tr>
+			<!-- <tr>
 				<td class="font_welcome_Edescription">Trustie forge,a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.</td>
-			</tr>
+			</tr> -->
 		</table>
 	</div>
 	<table>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 910c8e3bf..061518066 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1314,4 +1314,5 @@ en:
   label_sort_by_active: sorting by active
   label_sort_by_influence: sorting by influence
   label_bids_published: published
-  label_bids_published_ago: ago
+  label_bids_published_ago: ago  label_welcome_trustie: Trustie forge
+  label_welcome_trustie_description: a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 294e7b48d..896a0bbae 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1333,4 +1333,6 @@ zh:
   label_sort_by_active: 按活跃度排序
   label_sort_by_influence: 按影响力排序
   label_bids_published: 发布于
-  label_bids_published_ago: 之前
\ No newline at end of file
+  label_bids_published_ago: 之前
+  label_welcome_trustie: Trustie
+  label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、软件开发和众包平台。
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1ce530e6d..25a2940ad 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -158,13 +158,13 @@ ul.tool li{list-style-type:none;
 .font_welcome_trustie{
 	font-family:Impact;
 	font-weight: regular;
-	font-size: 24px;
+	font-size: 28px;
 	color:#15bccf;
 }
 
 .font_welcome_Cdescription{
 	font-family: 微软雅黑; 
-	font-size: 18px;		
+	font-size: 20px;		
 	color: #5c5c5c; 	
 }
 
@@ -239,7 +239,7 @@ ul.tool li{list-style-type:none;
 .spaceright{float:left; width:620px;}
 
 .welcone_left{
-	margin-top: 50px;
+	margin-top: 60px;
 	margin-left: 90px;
 	float:left;
 	width: 49%;