From b0bb8b4a484e122ea33a4a31ef39215988de452e Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Sat, 28 Dec 2013 12:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply_items.html.erb | 7 ++-----
 public/stylesheets/welcome.css                | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 738ce2132..2b2bffbeb 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -1,23 +1,20 @@
 <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
 <li id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
 	<span class="portrait">
-		<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
+		    <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
 	</span>
 	<div class="message-body">
-		  <% id = 'project_respond_form_'+ reply.id.to_s %>
+		    <% id = 'project_respond_form_'+ reply.id.to_s %>
 		<p>
 		    <span><%= link_to reply.user.name, user_path(reply.user) %>:&nbsp;</span>
 		    <span class="message-notes"> <%= reply.notes %></span>
 	    </p>
-	    <%# ids = 'project_respond_form_'+ journal.id.to_s%>
-	       
 	    <p>
 	    	<span class="time"><%= format_time reply.created_on %></span>
 	    	<span style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
 					 <%= link_to l(:label_projects_feedback_respond),'',
 	                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}: '); return false;"}
 	                 %>
-	                 
 	                 <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %>
 						 <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
 						 :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index c3e021808..7eeea1b00 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -159,6 +159,7 @@ li {
     margin: 0px;
     padding: 0px;
     background-color: rgb(252, 252, 252);
+    margin-top: 6px;
 }
 .d-p-index-newsource li,.d-p-index-hotproject ul.d-p-projectlist li{
     color: rgb(102, 102, 102);