1234

app/views/layouts/base_bids.html.erb

@@ -70,10 +70,10 @@
 														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
 													</tr>												
 													<tr>
-														<td align="center"> <%= watcher_link(@bid, User.current) %></td>
+														<td align="center"> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %></td>
 													</tr>
 													<tr>
-														<td align="center"> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %></td>
+														<td align="center"> <span style="margin-right:10px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span></td>
 													</tr>
 												</table></td>
 											</tr>

app/views/layouts/base_contest.html.erb

@@ -65,8 +65,9 @@
 													</tr>															
 													<tr colspan='3'>
 														<td valign="middle">
-															<%= join_in_contest(@bid, User.current)%>
+															<span style="display:block; margin-left:20px;"><%= join_in_contest(@bid, User.current)%></span>
-															<%= watcher_link(@bid, User.current) %> <!-- <%= link_to("选为作业", fork_path(@bid)) %> --></td>
+															<span style="display:block; margin-left:20px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span>
+														</td>
 												   </tr>
 												</table>									
 							   <!-- added by bai 增加了竞赛的配置 -->

app/views/layouts/base_projects.html.erb

@@ -62,7 +62,8 @@
 											<div class="info-course">
 												<%= @project.name %>
 											</div>
-											<div style="text-align: center;">				
+											<div style="margin-left: 20px;">	
+												<span class="icon-fav icon"></span>			
 												<% unless User.current.member_of? @project %>
 												   <span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %>
 												<% end %>

app/views/welcome/index.html.erb

@@ -1,5 +1,5 @@
 <!--add by huang-->
-<div style="height:200px;">
+<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>			

public/themes/redpenny-master/stylesheets/application.css

@@ -1869,7 +1869,7 @@ input[type='text'].noline {
 	font-size: 12px;
 	color: #818283;    # modified by bai
 	padding: 9px 5px;
-	width: 85%;
+	width: 98%;
 	cursor: text;
 	border-radius: 4px;  /*# added by bai (边框变圆润)*/
 }