Merge remote-tracking branch 'upstream/pull/2753'

[rails.git] / app / views / issues / _comments.html.erb

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 7ff0948db5e961fa53379ebea39e50c166aeb901..54932cc56b4f8f1e3b3905d4cd7760d7993ae470 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,15 +1,15 @@
 <div class="issue-comments">
   <% comments.each do |comment| %>
     <div class="comment">
 <div class="issue-comments">
   <% comments.each do |comment| %>
     <div class="comment">

-      <div style="float:left">
+      <div class="float-left">

         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>
         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>

-      <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br />
-      <%= comment.body %>
+      <p class="text-muted mb-0">
+        <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
+                                    :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+      </p>
+      <p><%= comment.body %></p>

     </div>
     </div>

-    <span class="deemphasize">
-      <%= t(".created_at", :datetime => l(comment.created_at.to_datetime, :format => :friendly)) %>
-    </span>

     <hr>
   <% end %>
 </div>
     <hr>
   <% end %>
 </div>