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

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

diff --git a/app/views/notifier/_message_body.html.erb b/app/views/notifier/_message_body.html.erb
index a108643ceb9292fd433e743c3727f61912552a06..d572fb9d0a79e92e7486b56218d63792295b0116 100644 (file)
--- a/app/views/notifier/_message_body.html.erb
+++ b/app/views/notifier/_message_body.html.erb
@@ -1,23 +1,20 @@
-<table style="font-size: 15px; font-style: italic; margin: 15px; background-color: #eee; width: 520px">
+<table style="font-size: 15px; margin: 15px 0px; background-color: #eee; width: 100%">
   <tr>
-    <td style="width: 50px; vertical-align: top; padding: 5px 15px">
-      <%# Some email clients (e.g. Yahoo as of 2017-01) remove the margin
-        on <p> tags. Since the body itself always starts with a <p>, by
-        wrapping the image here in a <p> as well, we ensure that they will at
-        least always be aligned with each other. %>
-      <p>
-        <%= link_to(
+    <td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
+      <%= link_to(
             image_tag(
               attachments["avatar.png"].url,
-              alt: @author,
-              title: @author
+              :alt => @author,
+              :title => @author,
+              :width => 50,
+              :height => 50,
+              :border => 0
             ),
-            user_url(@author, :host => SERVER_URL),
-            :target => "_blank"
-        ) %>
-      </p>
+            user_url(@author),
+            :target => "_blank", :rel => "noopener"
+          ) %>
     </td>
-    <td style="text-align: left; vertical-align: top; padding-right: 10px">
+    <td style="text-align: <%= style_left %>; vertical-align: top; padding-<%= style_right %>: 10px; width: 100%">
       <%= body %>
     </td>
   </tr>