From a27e89f898914ef9e63272f820e36cc5f0524d89 Mon Sep 17 00:00:00 2001
From: drummer83 <mail@konradsachse.de>
Date: Mon, 25 Dec 2023 22:02:24 +0100
Subject: [PATCH] Header: Improve logo, resizing and styles

Use the sites main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)

The table's background color is defined in the parent table already

Limit the max width and max height of the logo and resize the logo accordingly instead of forcing it to squeeze into a fixed size

Update specs
---
 app/assets/stylesheets/mail/email.scss   | 4 ++++
 app/views/layouts/mailer.html.haml       | 6 +++---
 spec/mailers/order_mailer_spec.rb        | 4 ++--
 spec/mailers/subscription_mailer_spec.rb | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/mail/email.scss b/app/assets/stylesheets/mail/email.scss
index bfb0684f9c..844cd3b342 100644
--- a/app/assets/stylesheets/mail/email.scss
+++ b/app/assets/stylesheets/mail/email.scss
@@ -121,6 +121,10 @@ table.order-summary {
   text-align: right;
 }
 
+.middle {
+  vertical-align: middle;
+}
+
 .social .soc-btn {
   padding: 3px 7px;
   font-size: 12px;
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index f12aad1928..3383c5aa60 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -13,11 +13,11 @@
           %td
           %td.header.container
             .content
-              %table{:bgcolor => "#f2f2f2"}
+              %table
                 %tr
                   %td
-                    = image_tag ContentConfig.url_for(:footer_logo), width: "144", height: "50"
-                  %td{:align => "right"}
+                    = image_tag ContentConfig.url_for(:logo), style: "max-height: 50px; max-width: 300px;"
+                  %td.text-right
                     %h6.collapse
                       = Spree::Config[:site_name]
           %td
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index a991f8659d..cb1743b00c 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Spree::OrderMailer do
     end
 
     it "display the OFN header by default" do
-      expect(email.body).to include(ContentConfig.url_for(:footer_logo))
+      expect(email.body).to include(ContentConfig.url_for(:logo))
     end
 
     context 'when hide OFN navigation is enabled for the distributor of the order' do
@@ -55,7 +55,7 @@ RSpec.describe Spree::OrderMailer do
       end
 
       it 'does not display the OFN navigation' do
-        expect(email.body).not_to include(ContentConfig.url_for(:footer_logo))
+        expect(email.body).not_to include(ContentConfig.url_for(:logo))
       end
     end
   end
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
index aca63f8f58..9653423b9a 100644
--- a/spec/mailers/subscription_mailer_spec.rb
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -117,7 +117,7 @@ RSpec.describe SubscriptionMailer, type: :mailer do
     end
 
     it "display the OFN header by default" do
-      expect(email.body).to include(ContentConfig.url_for(:footer_logo))
+      expect(email.body).to include(ContentConfig.url_for(:logo))
     end
 
     describe "linking to order page" do
@@ -162,7 +162,7 @@ RSpec.describe SubscriptionMailer, type: :mailer do
       end
 
       it 'does not display the OFN navigation' do
-        expect(email.body).not_to include(ContentConfig.url_for(:footer_logo))
+        expect(email.body).not_to include(ContentConfig.url_for(:logo))
       end
     end
   end