Merge branch 'next-minor' into develop

Changelog.md

@@ -10,6 +10,7 @@
 
 ## Refactor
 * Indicate proper way to report bugs in the sidebar [#7039](https://github.com/diaspora/diaspora/pull/7039)
+* Remove text color from notification mails and fix sender avatar [#7054](https://github.com/diaspora/diaspora/pull/7054)
 
 ## Bug fixes
 

app/views/layouts/notifier.html.erb

@@ -1,36 +0,0 @@
-<table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;color:#333;">
-  <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;color:#333;">
-    <tr width="100%">
-      <% if @sender %>
-        <td style="vertical-align:top;" width="80px">
-          <div style="background-color:#eee;height:70px;width:70px;">
-            <img alt="<%=@sender.name%>" src="<%=@sender.profile.image_url(:medium)%>" style="border:0;display:block;display:relative;top:0;left:0;" height="70px" width="70px">
-          </div>
-        </td>
-      <% end %>
-      <td style="vertical-align:top;">
-        <%= yield %>
-      </td>
-    </tr>
-  </table>
-
-  <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:12px;color:#999; padding-top:10px; margin-top:10px; border-top: 1px solid #ddd;">
-    <tr>
-      <td>
-        <%= t('notifier.email_sent_by_diaspora', :pod_name => pod_name) %>
-        <a href="<%=edit_user_url%>">
-          <%= t('notifier.click_here') %>
-        </a>
-        <%=t('notifier.to_change_your_notification_settings')%>.
-      </td>
-    </tr>
-  </table>
-  <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;color:#333;">
-    <tr>
-      <td style="text-align:center;padding:30px;">
-        <img src="<%= image_url("branding/logos/logo_small.png") %>" alt="diaspora*" width="59px" height="14px"/>
-      </td>
-    </tr>
-  </table>
-</table>
-

app/views/layouts/notifier.html.haml

@@ -0,0 +1,15 @@
+%table{cellspacing: 0, cellpadding: 0, border: 0,
+       style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"}
+  %tr
+    - if @notification.try(:sender)
+      %td{width: "60px", style: "vertical-align: top"}>
+        %div{style: "background-color: #eee; height: 50px; width: 50px"}
+          = image_tag @notification.sender.profile.image_url(:thumb_small), alt: @notification.sender.name,
+                      style: "border: 0, display: block; top: 0; left: 0", height: "50px", width: "50px"
+    %td{style: "vertical-align: top"}
+      != yield
+
+%div{style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; color: #999; padding-top: 10px; margin-top: 10px; border-top: 1px solid #ddd"}
+  != t("notifier.email_sent_by_diaspora", pod_name: pod_name)
+  != link_to t("notifier.click_here"), edit_user_url
+  != t("notifier.to_change_your_notification_settings") + "."