From 8f45c12b8968a796a9e3c9e2765b1c5c29b78281 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 21:49:06 -0400 Subject: [PATCH] fix welcome vertical spacing, make it flexible --- src/components/join-flow/join-flow-steps.scss | 18 ++++++++++-------- src/components/join-flow/welcome-step.jsx | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss index 654d57f08..abddb3b99 100644 --- a/src/components/join-flow/join-flow-steps.scss +++ b/src/components/join-flow/join-flow-steps.scss @@ -132,20 +132,14 @@ } .join-flow-inner-welcome-step { - padding-top: 3rem; + padding-top: 0; + padding-bottom: 1rem; } .join-flow-birthdate-title { margin-bottom: 2.875rem; } -.join-flow-birthdate-description { - margin-top: 1.25rem; - margin-right: -.5rem; - margin-bottom: 2rem; - margin-left: -.5rem; -} - .join-flow-email-title { margin-bottom: 2rem; } @@ -172,6 +166,14 @@ margin-bottom: 1.75rem; } +.join-flow-welcome-title { + margin-bottom: .25rem; +} + +.join-flow-welcome-description { + margin-bottom: 1.25rem; +} + .gender-radio-row { transition: all .125s ease; width: 20.875rem; diff --git a/src/components/join-flow/welcome-step.jsx b/src/components/join-flow/welcome-step.jsx index 42b9ac8b1..6affebf09 100644 --- a/src/components/join-flow/welcome-step.jsx +++ b/src/components/join-flow/welcome-step.jsx @@ -42,6 +42,7 @@ class WelcomeStep extends React.Component { description={this.props.intl.formatMessage({ id: 'registration.welcomeStepDescriptionNonEducator' })} + descriptionClassName="join-flow-welcome-description" headerImgSrc="/images/join-flow/welcome-header.png" innerClassName="join-flow-inner-welcome-step" nextButton={ @@ -57,6 +58,7 @@ class WelcomeStep extends React.Component { {id: 'registration.welcomeStepTitleNonEducator'}, {username: this.props.username} )}`} + titleClassName="join-flow-welcome-title" waiting={isSubmitting} onSubmit={handleSubmit} >