Address design feedback

Automattic · Jun 15, 2020 · ef35d10 · ef35d10
1 parent 2345c6f
commit ef35d10
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/client/signup/p2-step-wrapper/style.scss b/client/signup/p2-step-wrapper/style.scss
@@ -60,7 +60,3 @@
 	font-size: 14px;
 	line-height: 17px;
 }
-
-body.is-section-signup .layout:not( .dops ) .step-wrapper {
-	margin: 0;
-}
diff --git a/client/signup/steps/p2-site/index.jsx b/client/signup/steps/p2-site/index.jsx
@@ -262,6 +262,7 @@ class P2Site extends React.Component {
 						type="text"
 						name="site-title"
 						value={ formState.getFieldValue( this.state.form, 'siteTitle' ) }
+						isError={ formState.isFieldInvalid( this.state.form, 'siteTitle' ) }
 						isValid={ formState.isFieldValid( this.state.form, 'siteTitle' ) }
 						onBlur={ this.handleBlur }
 						onChange={ this.handleChangeEvent }
@@ -298,10 +299,6 @@ class P2Site extends React.Component {
 			return this.props.translate( 'Site created - Go to next step' );
 		}
 
-		if ( this.state.submitting ) {
-			return this.props.translate( 'Creating your site…' );
-		}
-
 		return this.props.translate( 'Continue' );
 	};
 
@@ -318,7 +315,9 @@ class P2Site extends React.Component {
 				<form className="p2-site__form" onSubmit={ this.handleSubmit } noValidate>
 					{ this.formFields() }
 					<div className="p2-site__form-footer">
-						<FormButton className="p2-site__form-submit-btn">{ this.buttonText() }</FormButton>
+						<FormButton disabled={ this.state.submitting } className="p2-site__form-submit-btn">
+							{ this.buttonText() }
+						</FormButton>
 					</div>
 				</form>
 

diff --git a/client/signup/style.scss b/client/signup/style.scss
@@ -30,6 +30,10 @@ body.is-section-signup {
 		.layout__content {
 			padding: 0;
 		}
+
+		.layout:not( .dops ) .step-wrapper {
+			margin: 0;
+		}
 	}
 
 	// Adjust the padding as we no longer