From e067379f48bfb1e0e8ad2f8922c7da8dfa7f1ebc Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 28 Oct 2021 17:29:20 -0230 Subject: [PATCH] Remove the partially-applied dark mode styles used for beta (#12489) The beta build currently has a couple of UI elements (the horizontal logo and the app header) set to "dark mode", even though nothing else in our UI supports dark mode yet. These styles have been removed. We should make the entire UI support dark mode all at once at a later date. Also the horizontal logo used for beta was named incorrectly; the dark and non-dark logos were swapped. They have been switched back so that the logo that ends with `-dark` is for dark mode. --- .../beta/logo/metamask-logo-horizontal-dark.svg | 16 ++++++++-------- .../beta/logo/metamask-logo-horizontal.svg | 16 ++++++++-------- ui/components/app/app-header/index.scss | 8 -------- .../ui/metafox-logo/metafox-logo.component.js | 11 ++--------- ui/helpers/utils/build-types.js | 2 -- .../create-password/create-password.component.js | 3 +-- .../end-of-flow/end-of-flow.component.js | 3 +-- .../metametrics-opt-in.component.js | 3 +-- .../seed-phrase/seed-phrase.component.js | 3 +-- .../select-action/select-action.component.js | 3 +-- ui/pages/routes/routes.component.js | 2 -- 11 files changed, 23 insertions(+), 47 deletions(-) diff --git a/app/build-types/beta/logo/metamask-logo-horizontal-dark.svg b/app/build-types/beta/logo/metamask-logo-horizontal-dark.svg index 3155a5149..43a44eb0e 100644 --- a/app/build-types/beta/logo/metamask-logo-horizontal-dark.svg +++ b/app/build-types/beta/logo/metamask-logo-horizontal-dark.svg @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + diff --git a/app/build-types/beta/logo/metamask-logo-horizontal.svg b/app/build-types/beta/logo/metamask-logo-horizontal.svg index 43a44eb0e..3155a5149 100644 --- a/app/build-types/beta/logo/metamask-logo-horizontal.svg +++ b/app/build-types/beta/logo/metamask-logo-horizontal.svg @@ -1,13 +1,13 @@ - - - - - - - - + + + + + + + + diff --git a/ui/components/app/app-header/index.scss b/ui/components/app/app-header/index.scss index ab706635e..78fb809e3 100644 --- a/ui/components/app/app-header/index.scss +++ b/ui/components/app/app-header/index.scss @@ -96,10 +96,6 @@ flex: 1 0 auto; width: 0; justify-content: flex-end; - - .beta & span { - color: $ui-3; - } } &__network-down-arrow { @@ -108,8 +104,4 @@ background-size: contain; background-position: center; } - - .beta & { - background: $ui-black; - } } diff --git a/ui/components/ui/metafox-logo/metafox-logo.component.js b/ui/components/ui/metafox-logo/metafox-logo.component.js index 4a3812dd5..04a626fd0 100644 --- a/ui/components/ui/metafox-logo/metafox-logo.component.js +++ b/ui/components/ui/metafox-logo/metafox-logo.component.js @@ -1,23 +1,20 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; -import { getBuildSpecificAsset } from '../../../helpers/utils/build-types'; export default class MetaFoxLogo extends PureComponent { static propTypes = { onClick: PropTypes.func, unsetIconHeight: PropTypes.bool, - useDark: PropTypes.bool, isOnboarding: PropTypes.bool, }; static defaultProps = { onClick: undefined, - useDark: false, }; render() { - const { onClick, unsetIconHeight, useDark, isOnboarding } = this.props; + const { onClick, unsetIconHeight, isOnboarding } = this.props; const iconProps = unsetIconHeight ? {} : { height: 42, width: 42 }; return ( @@ -31,11 +28,7 @@ export default class MetaFoxLogo extends PureComponent { > - + - +
🎉
{t('congratulations')}
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js index 97ba3cd47..883f086d5 100644 --- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js +++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js @@ -2,7 +2,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import MetaFoxLogo from '../../../components/ui/metafox-logo'; import PageContainerFooter from '../../../components/ui/page-container/page-container-footer'; -import { isBeta } from '../../../helpers/utils/build-types'; export default class MetaMetricsOptIn extends Component { static propTypes = { @@ -31,7 +30,7 @@ export default class MetaMetricsOptIn extends Component { return (
- +
diff --git a/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js b/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js index db31f3c39..612e86c77 100644 --- a/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js +++ b/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js @@ -11,7 +11,6 @@ import { DEFAULT_ROUTE, } from '../../../helpers/constants/routes'; import MetaFoxLogo from '../../../components/ui/metafox-logo'; -import { isBeta } from '../../../helpers/utils/build-types'; import ConfirmSeedPhrase from './confirm-seed-phrase'; import RevealSeedPhrase from './reveal-seed-phrase'; import SeedPhraseIntro from './seed-phrase-intro'; @@ -51,7 +50,7 @@ export default class SeedPhrase extends PureComponent { return (
- + - +
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index 620e34cff..91a68e17c 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -62,7 +62,6 @@ import { ENVIRONMENT_TYPE_POPUP, } from '../../../shared/constants/app'; import { getEnvironmentType } from '../../../app/scripts/lib/util'; -import { isBeta } from '../../helpers/utils/build-types'; import ConfirmationPage from '../confirmation'; import OnboardingFlow from '../onboarding-flow/onboarding-flow'; @@ -304,7 +303,6 @@ export default class Routes extends Component { [`os-${os}`]: os, [`browser-${browser}`]: browser, 'mouse-user-styles': isMouseUser, - 'beta': isBeta(), })} dir={textDirection} onClick={() => setMouseUserState(true)}