diff --git a/client/assets/images/icons/Woo_logo_color.svg b/client/assets/images/icons/Woo_logo_color.svg new file mode 100644 index 0000000000000..428eec450d935 --- /dev/null +++ b/client/assets/images/icons/Woo_logo_color.svg @@ -0,0 +1,6 @@ + diff --git a/client/blocks/signup-form/index.jsx b/client/blocks/signup-form/index.jsx index 053b952f81c8e..622e91258db11 100644 --- a/client/blocks/signup-form/index.jsx +++ b/client/blocks/signup-form/index.jsx @@ -1335,7 +1335,7 @@ class SignupForm extends Component { case this.props.isWoo: formProps = { inputPlaceholder: null, - submitButtonLabel: this.props.translate( 'Continue with email' ), + submitButtonLabel: this.props.translate( 'Continue' ), submitButtonLoadingLabel: , }; } diff --git a/client/layout/index.jsx b/client/layout/index.jsx index ac458b1eba632..2ac273e4d4803 100644 --- a/client/layout/index.jsx +++ b/client/layout/index.jsx @@ -315,6 +315,7 @@ class Layout extends Component { 'feature-flag-woocommerce-core-profiler-passwordless-auth': config.isEnabled( 'woocommerce/core-profiler-passwordless-auth' ), + 'feature-flag-woocommerce-rebrand-2-0': config.isEnabled( 'woocommerce/rebrand-2-0' ), } ); const optionalBodyProps = () => { diff --git a/client/layout/logged-out.jsx b/client/layout/logged-out.jsx index 1f7f42ebc354c..33e14583e2fb8 100644 --- a/client/layout/logged-out.jsx +++ b/client/layout/logged-out.jsx @@ -152,6 +152,7 @@ const LayoutLoggedOut = ( { 'feature-flag-woocommerce-core-profiler-passwordless-auth': config.isEnabled( 'woocommerce/core-profiler-passwordless-auth' ), + 'feature-flag-woocommerce-rebrand-2-0': config.isEnabled( 'woocommerce/rebrand-2-0' ), }; let masterbar = null; diff --git a/client/layout/masterbar/woo.jsx b/client/layout/masterbar/woo.jsx index bac1ebe3f0947..0b2cd29cb7e6f 100644 --- a/client/layout/masterbar/woo.jsx +++ b/client/layout/masterbar/woo.jsx @@ -1,8 +1,10 @@ +import config from '@automattic/calypso-config'; import { Gridicon } from '@automattic/components'; import { Button } from '@wordpress/components'; import { createInterpolateElement, Fragment } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; import { localize } from 'i18n-calypso'; +import WooLogoRebrand2 from 'calypso/assets/images/icons/Woo_logo_color.svg'; import WooLogo from 'calypso/assets/images/icons/woocommerce-logo.svg'; import SVGIcon from 'calypso/components/svg-icon'; import './typekit'; @@ -35,6 +37,27 @@ const WooOauthMasterbar = () => { } } + const isWooRebrand20 = config.isEnabled( 'woocommerce/rebrand-2-0' ); + const logo = isWooRebrand20 ? ( + + ) : ( + + ); + const backNav = (