Skip to content

Commit

Permalink
Improve greeting and intro styling to use less different font sizes a…
Browse files Browse the repository at this point in the history
…nd less bold formatting
  • Loading branch information
drummer83 committed Sep 21, 2024
1 parent 4fffe4b commit 966ddaa
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 28 deletions.
8 changes: 6 additions & 2 deletions app/assets/stylesheets/mail/email.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ p.footer, p.footer_icons a {
color: #999;
}

p.footer_icons {
p.signoff_icons, p.footer_icons {
font-size: 0px;

a {
Expand All @@ -87,6 +87,10 @@ p.footer_icons {
}
}

p.signoff_icons a:not(.ofn-i_image) {
font-size: 24px;
}

p.footer_icons a:not(.ofn-i_image) {
font-size: 20px;
}
Expand Down Expand Up @@ -313,7 +317,7 @@ h6 {
margin: 0 !important;
}

p, ul {
p, ul, span.signoff {
margin-bottom: 10px;
font-weight: normal;
font-size: 14px;
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/mailers/_greeting_and_intro.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- if @enterprise_for_logo
= image_tag @enterprise_for_logo.logo_url(:medium), class: "float-right"

%h4
%p
= greeting
%p
= intro
30 changes: 20 additions & 10 deletions app/views/shared/mailers/_signoff_distributor.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,27 @@
%p
= t('.signoff')
%br
#{@order.distributor.contact_name}
= @order.distributor.contact_name
%br
%br
= @order.distributor.name
%br
= @order.distributor.phone || ""
%br
%a{:href => "mailto:#{order_reply_email(@order)}", :target => "_blank"}
= order_reply_email(@order)
%br
= @order.distributor.website || ""
%br
= @order.distributor.instagram || ""

- if @order.distributor.phone.present?
%img{src: image_path("/map_icons/social-logos/phone.png"), style: "width: 24px; position: relative; top: 7px;" }
= @order.distributor.phone
%p.signoff_icons
%a.ofn-i_050-mail-circle{:href => "mailto:#{order_reply_email(@order)}", :target => "_blank"}
- if @order.distributor.website.present?
%a.ofn-i_049-web{:href => "http://#{@order.distributor.website}", :target => "_blank"}
- if @order.distributor.instagram.present?
%a.ofn-i_043-instagram{:href => "http://instagram.com/#{@order.distributor.instagram}", :target => "_blank"}
- if @order.distributor.facebook.present?
%a.ofn-i_044-facebook{:href => "http://#{@order.distributor.facebook}", :target => "_blank"}
- if @order.distributor.linkedin.present?
%a.ofn-i_042-linkedin{:href => "http://#{@order.distributor.linkedin}", :target => "_blank"}
- if @order.distributor.twitter.present?
%a.ofn-i_image{:href => "http://x.com/#{@order.distributor.twitter}", :target => "_blank"}
%img{src: image_path("/map_icons/social-logos/x.png"), style: "width: 24px; position: relative; top: 1.5px;" }
- if @order.distributor.whatsapp_phone.present?
%a.ofn-i_image{:href => @order.distributor.whatsapp_url, :target => "_blank" }
%img{src: image_path("/map_icons/social-logos/whatsapp.png"), style: "width: 24px; position: relative; top: 1.5px;" }
36 changes: 23 additions & 13 deletions app/views/shared/mailers/_signoff_enterprise.html.haml
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
%br
%p
= t('.signoff')
%br
= @coordinator.contact_name
%br
%br
= @coordinator.name
%em
%p
= @coordinator.name
%p
%br
= @coordinator.address.address1
%br
= @coordinator.address.city
%br
= @coordinator.address.zipcode
%p
= @coordinator.phone
%p
= @coordinator.contact.email
%br
= @coordinator.address.address1
%br
= @coordinator.address.city
= @coordinator.address.zipcode

- if @coordinator.phone.present?
%br
%img{src: image_path("/map_icons/social-logos/phone.png"), style: "width: 24px; position: relative; top: 7px;" }
= @coordinator.phone
- if @coordinator.contact.email.present?
%p.signoff_icons
%a.ofn-i_050-mail-circle{:href => "mailto:#{@coordinator.contact.email}", :target => "_blank"}
%span.signoff{style: "position: relative; top: -5px;" }
= @coordinator.contact.email
}
3 changes: 1 addition & 2 deletions app/views/shared/mailers/_signoff_instance.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
%p  

%br
%p
= t('.signoff')
%br
Expand Down
Binary file added public/map_icons/social-logos/phone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/map_icons/social-logos/whatsapp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/map_icons/social-logos/x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 966ddaa

Please sign in to comment.