From 953239396001ab1e8ae5d1afacc1b4271c85ca85 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 26 Apr 2020 16:05:59 -0400 Subject: [PATCH 1/4] Fix triangle bug for default and midnight theme --- app/scss/partials/_stats_graph.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scss/partials/_stats_graph.scss b/app/scss/partials/_stats_graph.scss index 5a19435e2..3ac2f6bc5 100644 --- a/app/scss/partials/_stats_graph.scss +++ b/app/scss/partials/_stats_graph.scss @@ -126,6 +126,6 @@ so that you can support switching between midnight theme and regular theme */ } .line.default, .line.midnight-theme { - fill: #124559; + stroke: #124559; } } From f7f11f2c34db29045c0dcb4a8effce5137517e63 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 26 Apr 2020 16:18:32 -0400 Subject: [PATCH 2/4] Rename midnight theme to dark blue theme --- _locales/en/messages.json | 2 +- app/panel/components/Subscription/SubscriptionThemes.jsx | 2 +- app/scss/partials/_stats_graph.scss | 6 +++--- src/classes/Metrics.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 61aabdae7..9950ca92c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1588,7 +1588,7 @@ } }, "hub_supporter_perk_themes_description": { - "message": "Customize the Ghostery colors - try our Midnight theme!" + "message": "Customize the Ghostery colors - try our Dark Blue theme!" }, "hub_supporter_perk_stats_description": { "message": "View your blocking statistics and see how Ghostery is working for you" diff --git a/app/panel/components/Subscription/SubscriptionThemes.jsx b/app/panel/components/Subscription/SubscriptionThemes.jsx index 046d77445..f368108ed 100644 --- a/app/panel/components/Subscription/SubscriptionThemes.jsx +++ b/app/panel/components/Subscription/SubscriptionThemes.jsx @@ -22,7 +22,7 @@ import { RadioButtonGroup } from '../BuildingBlocks'; * @memberOf SettingsComponents */ const SubscriptionThemes = (props) => { - const themes = ['default', 'midnight-theme', 'palm-theme', 'leaf-theme']; + const themes = ['default', 'dark-blue-theme', 'palm-theme', 'leaf-theme']; const themeLabels = ['subscription_default_theme', 'subscription_dark_blue_theme', 'subscription_palm_theme', 'subscription_leaf_theme']; const getIndexClicked = () => themes.indexOf(props.theme); diff --git a/app/scss/partials/_stats_graph.scss b/app/scss/partials/_stats_graph.scss index 3ac2f6bc5..5e89510cb 100644 --- a/app/scss/partials/_stats_graph.scss +++ b/app/scss/partials/_stats_graph.scss @@ -1,5 +1,5 @@ /* NOTE: will need to use color variables in CSS rather than D3 code accessors -so that you can support switching between midnight theme and regular theme */ +so that you can support switching between dark blue theme and regular theme */ // Function helper with color variables @function _url-friendly-color($color) { @@ -120,12 +120,12 @@ so that you can support switching between midnight theme and regular theme */ background-repeat: no-repeat; } .point-group { - .default, .midnight-theme { + .default, .dark-blue-theme { fill: #124559; } } .line.default, - .line.midnight-theme { + .line.dark-blue-theme { stroke: #124559; } } diff --git a/src/classes/Metrics.js b/src/classes/Metrics.js index 1ef073f08..eadd8a54b 100644 --- a/src/classes/Metrics.js +++ b/src/classes/Metrics.js @@ -511,7 +511,7 @@ class Metrics { _getThemeValue() { const { current_theme } = conf; switch (current_theme) { - case 'midnight-theme': + case 'dark-blue-theme': return 1; case 'leaf-theme': return 2; From 6c41fd511746a95077373915764e754817728c5c Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 23 Apr 2020 16:40:19 -0400 Subject: [PATCH 3/4] Revert "Rename midnight theme to dark blue theme" This reverts commit f7f11f2c34db29045c0dcb4a8effce5137517e63. --- _locales/en/messages.json | 2 +- app/panel/components/Subscription/SubscriptionThemes.jsx | 2 +- app/scss/partials/_stats_graph.scss | 6 +++--- src/classes/Metrics.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 9950ca92c..61aabdae7 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1588,7 +1588,7 @@ } }, "hub_supporter_perk_themes_description": { - "message": "Customize the Ghostery colors - try our Dark Blue theme!" + "message": "Customize the Ghostery colors - try our Midnight theme!" }, "hub_supporter_perk_stats_description": { "message": "View your blocking statistics and see how Ghostery is working for you" diff --git a/app/panel/components/Subscription/SubscriptionThemes.jsx b/app/panel/components/Subscription/SubscriptionThemes.jsx index f368108ed..046d77445 100644 --- a/app/panel/components/Subscription/SubscriptionThemes.jsx +++ b/app/panel/components/Subscription/SubscriptionThemes.jsx @@ -22,7 +22,7 @@ import { RadioButtonGroup } from '../BuildingBlocks'; * @memberOf SettingsComponents */ const SubscriptionThemes = (props) => { - const themes = ['default', 'dark-blue-theme', 'palm-theme', 'leaf-theme']; + const themes = ['default', 'midnight-theme', 'palm-theme', 'leaf-theme']; const themeLabels = ['subscription_default_theme', 'subscription_dark_blue_theme', 'subscription_palm_theme', 'subscription_leaf_theme']; const getIndexClicked = () => themes.indexOf(props.theme); diff --git a/app/scss/partials/_stats_graph.scss b/app/scss/partials/_stats_graph.scss index 5e89510cb..3ac2f6bc5 100644 --- a/app/scss/partials/_stats_graph.scss +++ b/app/scss/partials/_stats_graph.scss @@ -1,5 +1,5 @@ /* NOTE: will need to use color variables in CSS rather than D3 code accessors -so that you can support switching between dark blue theme and regular theme */ +so that you can support switching between midnight theme and regular theme */ // Function helper with color variables @function _url-friendly-color($color) { @@ -120,12 +120,12 @@ so that you can support switching between dark blue theme and regular theme */ background-repeat: no-repeat; } .point-group { - .default, .dark-blue-theme { + .default, .midnight-theme { fill: #124559; } } .line.default, - .line.dark-blue-theme { + .line.midnight-theme { stroke: #124559; } } diff --git a/src/classes/Metrics.js b/src/classes/Metrics.js index eadd8a54b..1ef073f08 100644 --- a/src/classes/Metrics.js +++ b/src/classes/Metrics.js @@ -511,7 +511,7 @@ class Metrics { _getThemeValue() { const { current_theme } = conf; switch (current_theme) { - case 'dark-blue-theme': + case 'midnight-theme': return 1; case 'leaf-theme': return 2; From c1ed9f8eefac3a5d634fe88368a846a2586b06cf Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 23 Apr 2020 16:47:30 -0400 Subject: [PATCH 4/4] Update comments and text from midnight -> dark blue --- _locales/en/messages.json | 4 ++-- app/scss/partials/_stats_graph.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 61aabdae7..a75b1b4af 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1588,7 +1588,7 @@ } }, "hub_supporter_perk_themes_description": { - "message": "Customize the Ghostery colors - try our Midnight theme!" + "message": "Customize the Ghostery colors - try our Dark Blue theme!" }, "hub_supporter_perk_stats_description": { "message": "View your blocking statistics and see how Ghostery is working for you" @@ -1603,7 +1603,7 @@ "message": "We strive to deliver the best privacy protection services to our users free of cost. While we do not charge for our privacy suite, you may choose to support us through a small monthly subscription. Join us in our mission by upgrading to Ghostery Plus - and unlock cool perks along the way!" }, "hub_supporter_feature_theme_description": { - "message": "Customize the Ghostery colors for a new visual experience! Introduced through popular request. Check out our special Midnight theme, and more to come." + "message": "Customize the Ghostery colors for a new visual experience! Introduced through popular request. Check out our special Dark Blue theme, and more to come." }, "hub_supporter_feature_stats_description": { "message": "View historical blocking results with graphs and statistics to reveal trends and learn how Ghostery has affected your browsing." diff --git a/app/scss/partials/_stats_graph.scss b/app/scss/partials/_stats_graph.scss index 3ac2f6bc5..44e04041c 100644 --- a/app/scss/partials/_stats_graph.scss +++ b/app/scss/partials/_stats_graph.scss @@ -1,5 +1,5 @@ /* NOTE: will need to use color variables in CSS rather than D3 code accessors -so that you can support switching between midnight theme and regular theme */ +so that you can support switching between dark blue theme and regular theme */ // Function helper with color variables @function _url-friendly-color($color) {