Revert email share button changes

SumOfUs · May 2, 2019 · ed82d59 · ed82d59
2 parents 93b6033 + ea5b221
commit ed82d59
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 30 deletions.
diff --git a/app/assets/stylesheets/member-facing/_colors.scss b/app/assets/stylesheets/member-facing/_colors.scss
@@ -12,7 +12,6 @@ $facebook: #597ac7;
 $twitter: #5dbeec;
 $paypal: #1a9ddb;
 $whatsapp: #25D366;
-$email: #f8492e;
 
 // grays, named per http://davidwalsh.name/sass-color-variables-dont-suck
 $chalk-gray: #ececec;

diff --git a/app/assets/stylesheets/member-facing/button.scss b/app/assets/stylesheets/member-facing/button.scss
@@ -49,7 +49,7 @@ button.button {
 // shareprogress isn't super customization friendly, so we do
 // what we can.
 .button {
-  &--facebook, &--twitter, &--whatsapp, &--email {
+  &--facebook, &--twitter, &--whatsapp {
     margin-top: 10px;
     margin-left: 5px;
     margin-right: 5px;
@@ -106,17 +106,6 @@ button.button {
       font-size: 0;
     }
   }
-  &--email {
-    &.sp_em_small, &.sp_em_large, &.sp_tw_small, &.sp_tw_large, &.sp_fb_small, &.sp_fb_large {
-      a {
-        @include button($email);
-        padding-top: 15px;
-        color: $email;
-        font-size: 1px;
-        font-size: 0;
-      }
-    }
-  }
   &--facebook a::before {
     content: "Share";
   }
@@ -129,10 +118,4 @@ button.button {
   &--twitter a::after {
     content: '\f099';
   }
-  &--email a::before {
-    content: "Email";
-  }
-  &--email a::after {
-    content: "\f0e0";
-  }
 }
diff --git a/app/javascript/components/DonationBands/__snapshots__/DonationBands.test.js.snap b/app/javascript/components/DonationBands/__snapshots__/DonationBands.test.js.snap
@@ -235,7 +235,6 @@ SumOfUs",
         "share.cta": "Share the campaign!",
         "share.send_email": "Send Email",
         "share.share": "Share",
-        "share.share_on_email": "Email",
         "share.share_on_whatsapp": "Whatsapp",
         "share.tweet": "Tweet",
         "share.twitter_handle": "@sumofus",
@@ -679,7 +678,6 @@ SumOfUs",
         "share.cta": "Share the campaign!",
         "share.send_email": "Send Email",
         "share.share": "Share",
-        "share.share_on_email": "Email",
         "share.share_on_whatsapp": "Whatsapp",
         "share.tweet": "Tweet",
         "share.twitter_handle": "@sumofus",

diff --git a/app/javascript/components/__snapshots__/ComponentWrapper.test.js.snap b/app/javascript/components/__snapshots__/ComponentWrapper.test.js.snap
@@ -221,7 +221,6 @@ SumOfUs",
       "share.cta": "Share the campaign!",
       "share.send_email": "Send Email",
       "share.share": "Share",
-      "share.share_on_email": "Email",
       "share.share_on_whatsapp": "Whatsapp",
       "share.tweet": "Tweet",
       "share.twitter_handle": "@sumofus",

diff --git a/app/liquid/views/partials/_share.liquid b/app/liquid/views/partials/_share.liquid
@@ -8,10 +8,9 @@
   .button--whatsapp a::before{
     content: "{{ 'share.share_on_whatsapp' | t }}";
   }
-  .button--email a::before{
-    content: "{{ 'share.share_on_email' | t }}";
+  .share-buttons__simple-email-link.sp_em_small a::before, .share-buttons__simple-email-link.sp_em_large a::before {
+    content: "{{ 'share.send_email' | t }}";
   }
-
 </style>
 
 <div class="share-buttons">
@@ -29,6 +28,8 @@
   {% endunless %}
 
   {% unless shares['email'] == blank %}
-    <div class="share-buttons__button button--email {{ shares['email'].css_class }}"></div>
+    <div class="share-buttons__alternative">
+      {{ 'basics.or' | t }} <div class="share-buttons__simple-email-link {{ shares['email'].css_class }}"></div>
+    </div>
   {% endunless %}
 </div>
diff --git a/config/locales/member_facing.de.yml b/config/locales/member_facing.de.yml
@@ -161,7 +161,6 @@ de:
   share:
     cta: Teilen Sie die Kampagne mit Ihren Freunden und verdreifachen Sie Ihre Wirkung!
     send_email: E-Mail senden
-    share_on_email: Email
     share: Facebook
     tweet: Twitter
     share_on_whatsapp: Whatsapp

diff --git a/config/locales/member_facing.en.yml b/config/locales/member_facing.en.yml
@@ -169,7 +169,6 @@ en:
   share:
     cta: Share the campaign!
     send_email: Send Email
-    share_on_email: Email
     share: Share
     tweet: Tweet
     share_on_whatsapp: Whatsapp

diff --git a/config/locales/member_facing.es.yml b/config/locales/member_facing.es.yml
@@ -170,7 +170,6 @@ es:
   share:
     cta: Share the campaign!
     send_email: Send Email
-    share_on_email: Email
     share: Share
     tweet: Tweet
     share_on_whatsapp: Whatsapp

diff --git a/config/locales/member_facing.fr.yml b/config/locales/member_facing.fr.yml
@@ -152,7 +152,6 @@ fr:
   share:
     cta: Partagez la campagne avec vos ami-e-s afin de tripler votre impact !
     send_email: Envoyer un courriel
-    share_on_email: Email
     share: Partager
     tweet: Tweeter
     share_on_whatsapp: Whatsapp