Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-1972: Triangle Bug on Dark Blue Theme and Update Copy Midnight Theme -> Dark Blue Theme #532

Merged
merged 5 commits into from Apr 26, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Rename midnight theme to dark blue theme
  • Loading branch information
benstrumeyer committed Apr 26, 2020
commit f7f11f2c34db29045c0dcb4a8effce5137517e63
@@ -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"
@@ -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'];
This conversation was marked as resolved by christophertino

This comment has been minimized.

@fcjr

fcjr Apr 23, 2020
Member

won't this cause the theme to not load as it is served as midnight-themeby the account api?

This comment has been minimized.

@benstrumeyer

benstrumeyer Apr 23, 2020
Author Contributor

Yup, it will break older versions. Changed that guy back, and it looks like the ping parameter is tied to that theme name, so we're good on GH-1974 too

const themeLabels = ['subscription_default_theme', 'subscription_dark_blue_theme', 'subscription_palm_theme', 'subscription_leaf_theme'];

const getIndexClicked = () => themes.indexOf(props.theme);
@@ -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;
}
}
@@ -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;
ProTip! Use n and p to navigate between commits in a pull request.