From 937d594c416ca97022983a2f34655ae81c2e6f39 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Tue, 25 Mar 2014 21:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AD=97=E4=BD=93?=
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 +-
 public/stylesheets/application.css | 9 +--------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index d0ad1fbcd..7cdc8cfa1 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) %> </span><span class="font_welcome_Mdescription"><%= 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) %> <%= 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 => Project::ProjectType_course}%>	
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 490833a2b..44c791420 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) %></span><span class="font_welcome_Mdescription"><%= 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) %><%= 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/public/stylesheets/application.css b/public/stylesheets/application.css
index 38aa5e6a9..8306155d2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -606,19 +606,12 @@ ul.tool li{list-style-type:none;
 }
 
 .font_welcome_trustie{
-	font-family:Impact;
+	font-family:Impact, '微软雅黑';
 	font-weight: bold;
 	font-size: 18px;
 	color:#15bccf;
 }
 
-.font_welcome_Mdescription{
-	font-family:微软雅黑;
-	font-weight: bold;
-	font-size: 17px;
-	color:#15bccf;
-}
-
 .font_welcome_Cdescription{
 	font-family: 微软雅黑; 
 	font-size: 16px;