Merge branch 'master' of github.com:railsrumble/rr10-team-167

guilleiguaran · Oct 17, 2010 · d3c47f2 · d3c47f2
2 parents b312ce2 + 366872c
commit d3c47f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/musts/_comments_list.html.erb b/app/views/musts/_comments_list.html.erb
@@ -1,7 +1,7 @@
 
 <% unless @must.comments.empty? %>
 	<% @must.comments.each do |comment| %>
-<div class="comment">	<span><%=avatar_for(comment.user,40)%><small><%=link_to comment.user.username ,user_path( comment.must.user)%></small><small><%=time_ago_in_words(comment.created_at)%> ago</small></span>
+<div class="comment">	<span><%=avatar_for(comment.user,40)%><small><%=link_to comment.user.username ,user_path( comment.must.user)%></small><small><%=time_ago_in_words(comment.created_at)%> <br /> ago</small></span>
 <p><%=h comment.content%> </p>
 </div> <!-- comment -->
   <%end%>

diff --git a/public/stylesheets/global.css b/public/stylesheets/global.css
@@ -484,7 +484,7 @@ margin-bottom:20px;
 			color:#999;
 			font-size:12px;
 			line-height:16px;
-			min-height:70px;
+			min-height:80px;
 		}	
 		#comments .comment span{
 			float:left;