From f077fd397b756c2cd82fcf34d822f8730775ca22 Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Mon, 2 Sep 2013 13:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_history.html.erb                          | 2 +-
 app/views/bids/_project_list.html.erb                     | 2 +-
 app/views/bids/show.html.erb                              | 2 +-
 app/views/layouts/base_projects.html.erb                  | 2 +-
 config/locales/zh.yml                                     | 2 +-
 public/stylesheets/application.css                        | 6 +++---
 public/themes/redpenny-master/stylesheets/application.css | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb
index 21115cdb8..aac579d7b 100644
--- a/app/views/bids/_history.html.erb
+++ b/app/views/bids/_history.html.erb
@@ -1,7 +1,7 @@
 <!-- added by fq -->
 <table width="660px" border="0" align="center">
 <tr>
-	<td class="font_lighter" style="font-size: 18px;"><%=l(:label_user_response)%></td>
+	<td class="font_lighter" style="font-size: 15px;"><%=l(:label_user_response)%></td>
 </tr></table>
 
 
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb
index 2be061612..bfe86c75c 100644
--- a/app/views/bids/_project_list.html.erb
+++ b/app/views/bids/_project_list.html.erb
@@ -1,7 +1,7 @@
 <!-- fq -->
 <%= render_flash_messages %>
 <table width="1000px" border="0" style="padding-left: 15px">
-	<td class="font_lighter" style="font-size: 18px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
+	<td class="font_lighter" style="font-size: 15px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
 	<% if User.current.logged? %>
 	<td>
 	<div class='icon icon-add'>
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 5e0ceb5df..d3b526982 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -31,7 +31,7 @@
 	<tr>
 		<td></td>
 		</tr>
-	<tr><td style="font-size: 15px; color: rgb(0,0,0);"><%= @bid.description %></td></tr>
+	<tr><td style="font-size: 13px; color: rgb(0,0,0);"><%= @bid.description %></td></tr>
 </table>
 </div>
 
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index f4165bdba..95744e44d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -34,7 +34,7 @@
 											<td><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
 											<td align="center">
 											<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
-												<%= textilizable @project.name %>
+												<%= @project.name %>
 											</div>
 											<div>				
 												<% unless User.current.member_of? @project %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c9bf309ba..b37cda246 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -494,7 +494,7 @@ zh:
   label_requirement: 需求
   label_requirement_focus: 关注需求
   label_developer: 用户
-  label_investor: 投资人
+  label_investor: 投资人：
   label_theme: 主题
   label_logged_as_new: 当前用户
   button_register: 注册
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7ed330ca3..1f3ecc746 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -4,7 +4,7 @@ body { font-family:'微软雅黑', Verdana, sans-serif; font-size: 13px; color:#
 h1, h2, h3, h4 {font-family: '微软雅黑', "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;}
 #content h1, h2, h3, h4 {color: #555;}
 h2, .wiki h1 {font-size: 20px;}
-h3, .wiki h2 {font-size: 16px;}
+h3, .wiki h2 {font-size: 15px;}
 h4, .wiki h3 {font-size: 13px;}
 h4 {border-bottom: 1px dotted #bbb;}
 
@@ -1571,7 +1571,7 @@ button.tab-right {
 #content .tabs_new {height: 2.6em; margin-bottom:1.2em; margin-top: 0.8em; position:relative; overflow:hidden;}
 #content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left: 0.5em; width: 2000px; border-bottom: 1px solid #15BCCF;font-size:14px;}
 #content .tabs_new ul li {
-  width:77px;  /*modified by linchun*/
+  width:80px;  /*modified by linchun*/
   float:left;
   list-style-type:none;
   white-space:nowrap;
@@ -1582,7 +1582,7 @@ button.tab-right {
 }
 #content .tabs_new ul li a{
   display:block;
-  font-size: 14px;
+  font-size: 15px;
   text-decoration:none;
   line-height:1.2em;
   padding-top: 6px;
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 5cd56cecd..b7393c56c 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -935,7 +935,7 @@ hr
 }
 p
 {
-	font-size: small
+	font-size: 13px
 }
 /*end*/
 div.issue
@@ -1563,7 +1563,7 @@ div.autoscroll li.id  a {
 
 div.autoscroll li.subject {
 	margin:0px 60px 0px 0px;
-	font-size: small;
+	font-size: 13px; 
 	line-height: 1.3;
 	word-wrap: break-word;
 }
@@ -1602,7 +1602,7 @@ div.issue-list-description {
 	color: rgb(72, 72, 72);
 	overflow: hidden;
 	white-space: nowrap;
-	font-size: small;
+	font-size: 13px; /*modify by men*/
 	text-overflow: ellipsis;
 	-o-text-overflow: ellipsis;
 }