From 282c51e20661717ff22c6cb7acf895e867c049f6 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 24 Apr 2020 13:19:53 -0400 Subject: [PATCH 1/4] Remove pricing from plus and premium promo modals. Move premium feature text to one line --- _locales/en/messages.json | 12 ++++++------ .../PlusPromoModalContent/PlusPromoModalContent.jsx | 2 +- .../PremiumPromoModalContent.jsx | 2 +- .../PremiumPromoModalContent.scss | 6 ++++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 61aabdae7..537866743 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1818,7 +1818,7 @@ "message": "While Ghostery is free, you can choose to support us through a small subscription of $2 per month in exchange for cool perks, such as color themes, priority help service, and more. Join our mission and subscribe!" }, "subscribe_pitch_spring": { - "message": "Support us and unlock a new spring theme, personal tracking insights, and other special perks by upgrading to Ghostery Plus for $2 per month." + "message": "Like what we do? Support us and unlock new spring themes, personal tracking insights, and other special perks by upgrading to Ghostery Plus" }, "subscribe_pitch_learn_more": { "message": "Learn more" @@ -2381,10 +2381,10 @@ "message": "Try Ghostery Midnight" }, "seven_day_free_trial": { - "message": "7 Day Free Trial ($14/mo)" + "message": "7 Day Free Trial" }, - "spring_has_sprung": { - "message": "Spring has sprung!" + "spring_is_here": { + "message": "Spring is here!" }, "full_coverage_protection_promise": { "message": "Get full-coverage protection across all browsers & apps on your device" @@ -2404,8 +2404,8 @@ "download_for_free": { "message": "Download for free" }, - "support_ghostery_for_2_instead": { - "message": "Support Ghostery for $2/mo instead" + "support_ghostery_and_try_plus_instead": { + "message": "Support Ghostery and try Plus instead" }, "no_thanks_continue_with_basic": { "message": "No thanks, continue with basic" diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx index b938559e5..c9bb01bf5 100644 --- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx +++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx @@ -33,7 +33,7 @@ const PlusPromoModalContent = (props) => {
-
{t('spring_has_sprung')}
+
{t('spring_is_here')}
diff --git a/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.jsx b/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.jsx index b4f925cfe..12a88527e 100644 --- a/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.jsx +++ b/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.jsx @@ -80,7 +80,7 @@ const PremiumPromoModalContent = (props) => {
{!isPlus && ( -
+
)} {isInHub && (
diff --git a/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss b/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss index 2efb25e78..f5c3b5e90 100644 --- a/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss +++ b/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss @@ -32,7 +32,8 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti } .PremiumPromoModal__main-content-container { - height: 210px; + height: 210px; + width: 508px; display: flex; flex-direction: column; align-items: center; @@ -65,6 +66,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti } .PremiumPromoModal__features-container { + margin-left: 15px; display: flex; width: 100%; } @@ -84,7 +86,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti display: flex; align-items: center; &:nth-child(1) { - margin-bottom: 4px; + margin-bottom: 10px; } } From 645c228a19aca780bafac587c161803585f068e2 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 24 Apr 2020 14:26:56 -0400 Subject: [PATCH 2/4] Change sign in link copy --- _locales/en/messages.json | 6 +++--- .../PlusPromoModalContent/PlusPromoModalContent.jsx | 3 +-- manifest.json | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 537866743..f35647245 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1832,6 +1832,9 @@ "subscribe_pitch_sign_here": { "message": "Already a subscriber? Sign in here" }, + "subscribe_pitch_sign_in_plus": { + "message": "Already a subscriber? Sign in" + }, "subscribe_pitch_sign_in": { "message": "Already subscribed? Sign in" }, @@ -2367,9 +2370,6 @@ "message": "Already subscribed? Sign In", "description": "Character limit (including spaces and punctuation): 28." }, - "already_subscribed_to_plus_sign_in": { - "message": "Already a plus subscriber?" - }, "promos_turned_off_notification": { "message": "Promos turned off. You can turn them back on in", "description": "translation must take into account that 'Settings' is appended to this string" diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx index c9bb01bf5..e62442567 100644 --- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx +++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx @@ -48,7 +48,7 @@ const PlusPromoModalContent = (props) => {
{!loggedIn && - {t('already_subscribed_to_plus_sign_in')} + {t('subscribe_pitch_sign_in_plus')} } {t('no_thanks_turn_promos_off')}
@@ -57,7 +57,6 @@ const PlusPromoModalContent = (props) => { ); }; - // PropTypes ensure we pass required props of the correct type PlusPromoModalContent.propTypes = { handleTryPlusClick: PropTypes.func.isRequired, diff --git a/manifest.json b/manifest.json index 7cad3c9d9..c3e8075bd 100644 --- a/manifest.json +++ b/manifest.json @@ -7,6 +7,7 @@ "version_name": "8.5.0", "default_locale": "en", "description": "__MSG_short_description__", + "debug": true, "log": true, "icons": { "16": "app/images/icon16.png", From 1c9f6c7fb9a4811f3fac8ceaca6f59f8a16fa16d Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 24 Apr 2020 14:28:56 -0400 Subject: [PATCH 3/4] Remove promo modal styling --- .../PremiumPromoModalContent/PremiumPromoModalContent.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss b/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss index f5c3b5e90..af4401cbd 100644 --- a/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss +++ b/app/shared-components/ModalContent/PremiumPromoModalContent/PremiumPromoModalContent.scss @@ -33,7 +33,6 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti .PremiumPromoModal__main-content-container { height: 210px; - width: 508px; display: flex; flex-direction: column; align-items: center; @@ -66,7 +65,6 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti } .PremiumPromoModal__features-container { - margin-left: 15px; display: flex; width: 100%; } @@ -86,7 +84,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti display: flex; align-items: center; &:nth-child(1) { - margin-bottom: 10px; + margin-bottom: 4px; } } From 336d35a93e0751c7dd34663ff233184bdd757f73 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 24 Apr 2020 14:29:48 -0400 Subject: [PATCH 4/4] Remove debug from manifest --- manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.json b/manifest.json index c3e8075bd..7cad3c9d9 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,6 @@ "version_name": "8.5.0", "default_locale": "en", "description": "__MSG_short_description__", - "debug": true, "log": true, "icons": { "16": "app/images/icon16.png",