Revert all e-mail related changes

openstreetmap · May 9, 2024 · aaa1224 · aaa1224
1 parent 480cda7
commit aaa1224
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/assets/images/avatar_small.png b/app/assets/images/avatar_small.png
diff --git a/app/assets/images/osm_logo_30.png b/app/assets/images/osm_logo_30.png
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
@@ -209,7 +209,7 @@ def set_shared_template_vars
   end
 
   def attach_project_logo
-    attachments.inline["osm_logo.svg"] = Rails.root.join("app/assets/images/osm_logo.svg").read
+    attachments.inline["logo.png"] = Rails.root.join("app/assets/images/osm_logo_30.png").read
   end
 
   def attach_user_avatar(user)
@@ -230,7 +230,7 @@ def user_avatar_filename(user)
       else "avatar"
       end
     else
-      "avatar.svg"
+      "avatar.png"
     end
   end
 
@@ -243,7 +243,7 @@ def user_avatar_file(user)
         avatar.blob.download
       end
     else
-      Rails.root.join("app/assets/images/avatar.svg").read
+      Rails.root.join("app/assets/images/avatar_small.png").read
     end
   end
 

diff --git a/app/views/layouts/user_mailer.html.erb b/app/views/layouts/user_mailer.html.erb
@@ -12,7 +12,7 @@
             <tr>
               <td style="width: 30px; padding-top: 10px; padding-<%= style_right %>: 10px; padding-bottom: 10px; padding-<%= style_left %>: 0px">
                 <a href="<%= @root_url %>" target="_blank">
-                  <%= image_tag attachments["osm_logo.svg"].url, :alt => "OpenStreetMap", :title => "OpenStreetMap", :height => "30", :width => "30", :border => "0" %>
+                  <%= image_tag attachments["logo.png"].url, :alt => "OpenStreetMap", :title => "OpenStreetMap", :height => "30", :width => "30", :border => "0" %>
                 </a>
               </td>
               <%# the "width: 100%" here looks wrong, but I couldn't find a better way of making Outlook give this cell full width %>