From 41c0204cfa77ce39233eb7ed6066eae5a9c57e34 Mon Sep 17 00:00:00 2001 From: Lucas Hiago Date: Fri, 17 Apr 2020 22:09:31 -0300 Subject: [PATCH 1/3] Update instagram and linkedin links --- app/models/content_configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/content_configuration.rb b/app/models/content_configuration.rb index 971cea658c..9c29a70576 100644 --- a/app/models/content_configuration.rb +++ b/app/models/content_configuration.rb @@ -57,8 +57,8 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration # Other preference :footer_facebook_url, :string, default: "https://www.facebook.com/OpenFoodNet" preference :footer_twitter_url, :string, default: "https://twitter.com/OpenFoodNet" - preference :footer_instagram_url, :string, default: "" - preference :footer_linkedin_url, :string, default: "http://www.linkedin.com/groups/Open-Food-Foundation-4743336" + preference :footer_instagram_url, :string, default: "https://www.instagram.com/openfoodnetworkuk/" + preference :footer_linkedin_url, :string, default: "https://www.linkedin.com/company/openfoodnetwork/" preference :footer_googleplus_url, :string, default: "" preference :footer_pinterest_url, :string, default: "" preference :footer_email, :string, default: "hello@openfoodnetwork.org" From ac2ab34e11383138a08bb8197cef226a839562bc Mon Sep 17 00:00:00 2001 From: Lucas Hiago Date: Sat, 18 Apr 2020 09:52:02 -0300 Subject: [PATCH 2/3] Add connect with us footer to customer order confirmation email --- .../spree/order_mailer/confirm_email_for_customer.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml index f91692fdb6..cfad3c42b5 100644 --- a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml +++ b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml @@ -25,3 +25,4 @@ = render 'shipping' = render 'special_instructions' = render 'signoff' += render 'shared/mailers/social_and_contact' From acfe0c540a6cf1825859f3e8085673cf5713f324 Mon Sep 17 00:00:00 2001 From: Lucas Hiago Date: Sat, 18 Apr 2020 10:02:09 -0300 Subject: [PATCH 3/3] Create instagram css property and apply --- app/assets/stylesheets/mail/email.css.scss | 4 ++++ app/views/shared/mailers/_social_and_contact.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/mail/email.css.scss b/app/assets/stylesheets/mail/email.css.scss index e6eabf665f..bb1006c9ea 100644 --- a/app/assets/stylesheets/mail/email.css.scss +++ b/app/assets/stylesheets/mail/email.css.scss @@ -138,6 +138,10 @@ a { &.ms { background-color: #000 !important; } + + &.ig { + background-color: #fb3958 !important; + } } .sidebar .soc-btn { diff --git a/app/views/shared/mailers/_social_and_contact.html.haml b/app/views/shared/mailers/_social_and_contact.html.haml index 49c44781df..7d8a74a457 100644 --- a/app/views/shared/mailers/_social_and_contact.html.haml +++ b/app/views/shared/mailers/_social_and_contact.html.haml @@ -18,7 +18,7 @@ %a.soc-btn.li{href: ContentConfig.footer_linkedin_url} LinkedIn -if ContentConfig.footer_instagram_url.present? - %a.soc-btn.tw{href: ContentConfig.footer_instagram_url} + %a.soc-btn.ig{href: ContentConfig.footer_instagram_url} Instagram %table.column{:align => "left"} %tr