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

[rails.git] / app / views / diary_entries / _diary_comment.html.erb

diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index 3893072adc11cfb58f73d0dbdd3f353f7c5b0b16..a7cdf21d7321d2215dc8caa915d8cd884c437e54 100644 (file)
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,12 +1,12 @@
-<div class="clearfix diary-comment<%= " deemphasize" unless diary_comment.visible? %>">
+<div class="clearfix diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">

   <%= user_thumbnail diary_comment.user %>
   <%= user_thumbnail diary_comment.user %>

-  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
+  <p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>

     <% if current_user and diary_comment.user.id != current_user.id %>
       | <%= report_link(t(".report"), diary_comment) %>
     <% end %>
   </p>
 
     <% if current_user and diary_comment.user.id != current_user.id %>
       | <%= report_link(t(".report"), diary_comment) %>
     <% end %>
   </p>
 

-  <div class="richtext"><%= diary_comment.body.to_html %></div>
+  <div class="richtext text-break"><%= diary_comment.body.to_html %></div>

   <% if can? :hidecomment, DiaryEntry %>
     <span>
       <% if diary_comment.visible? %>
   <% if can? :hidecomment, DiaryEntry %>
     <span>
       <% if diary_comment.visible? %>