From 8d2bbfe320bd46207e4191cd965e6409bf82938f Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 24 Mar 2014 21:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E9=83=A8=E5=88=86=E5=AD=97=E4=BD=93=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/course.html.erb  | 2 +-
 app/views/welcome/index.html.erb   | 2 +-
 config/locales/zh.yml              | 5 +++--
 public/stylesheets/application.css | 7 +++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index e1890a7e6..d7fafb49a 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -92,7 +92,7 @@
 	</div> 
 	<div class="main-content-bar">
 	<div class="welcome_left" >
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_course) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_Mdescription"><%= l(:label_welcome_trustie_course) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
 	</div>
 	<div class="search-bar">
 		<%= render :partial => "search_project", :locals => {:project_type => 1}%>	
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 0af0dea21..ad23a3b6b 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -92,7 +92,7 @@
 	</div> 
 	<div class="main-content-bar">
 	<div class="welcome_left" >
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_project) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_project_description) %></span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %></span><span class="font_welcome_Mdescription"><%= l(:label_welcome_trustie_project) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_project_description) %></span>
 	</div>
 	<div class="search-bar">		
 		<%= render :partial => "search_project", :locals => {:project_type => 0}%>	
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a305a7240..e57fce2f2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1544,8 +1544,9 @@ zh:
   label_sort_by_influence: 按影响力排序
   label_bids_published: 发布于
   label_bids_published_ago: 之前
-  label_welcome_trustie_project: Trustie在线项目托管平台
-  label_welcome_trustie_course: Trustie在线课程实践平台
+  label_welcome_trustie: Trustie
+  label_welcome_trustie_project: 在线项目托管平台
+  label_welcome_trustie_course: 在线课程实践平台
   label_welcome_trustie_project_description: 面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。
   label_welcome_trustie_course_description: 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。
   label_user_project: 项目
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2ac667946..38aa5e6a9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -612,6 +612,13 @@ ul.tool li{list-style-type:none;
 	color:#15bccf;
 }
 
+.font_welcome_Mdescription{
+	font-family:微软雅黑;
+	font-weight: bold;
+	font-size: 17px;
+	color:#15bccf;
+}
+
 .font_welcome_Cdescription{
 	font-family: 微软雅黑; 
 	font-size: 16px;