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

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 2389598bcb61b3612984d26d98d66908de9a3430..0b91ca1264b4cc4520c607758703b97a187d35dd 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -15,7 +15,7 @@
     <%= note_event("opened", @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br />
     <%= note_event("opened", @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br />

-      <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
+      <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>

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


@@ -24,15 +24,15 @@
   <% end -%>
 
   <% if current_user && current_user != @note.author %>
   <% end -%>
 
   <% if current_user && current_user != @note.author %>

-    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+    <p class="text-muted"><%= report_link(t(".report"), @note) %></p>

   <% end %>
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
   <% end %>
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>

-      <ul>
+      <ul class="list-unstyled">

         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">
         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">

-            <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>

             <%= comment.body.to_html %>
           </li>
         <% end %>
             <%= comment.body.to_html %>
           </li>
         <% end %>