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

[rails.git] / app / views / notifier / diary_comment_notification.html.erb

diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index ea9a655910173e969121d5ac3c1061076cb89c2d..73bfe9a33d655b6c117cd3ddcb69e6cd2b53a758 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,14 +1,12 @@
-<% content_for :body do %>
-  <p style="margin: 0">
-    <%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %>
-  </p>
-  <p>
-    <%= raw t'notifier.diary_comment_notification.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>
-  </p>
+<p>
+  <%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %>
+</p>
+<p>
+  <%= raw t'notifier.diary_comment_notification.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>
+</p>
 
-  <%= render "notifier/user_message_table", :captured => capture { %>
-    <%= @text.to_html %>
-  <% } %>
+<%= message_body do %>
+  <%= @text.to_html %>
 <% end %>
 
 <% content_for :footer do %>