From 70baf75f5e0905b20ed005c90e6e2b02d1d18e27 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Wed, 11 Sep 2019 10:39:46 -0400 Subject: [PATCH 01/23] reorder join flow to put country second --- src/components/join-flow/join-flow.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/join-flow/join-flow.jsx b/src/components/join-flow/join-flow.jsx index 989ce7f14..a028fbb52 100644 --- a/src/components/join-flow/join-flow.jsx +++ b/src/components/join-flow/join-flow.jsx @@ -137,9 +137,9 @@ class JoinFlow extends React.Component { ) : ( + - Date: Sun, 15 Sep 2019 17:05:47 -0400 Subject: [PATCH 02/23] move privacy message to below inputs; format color --- src/_colors.scss | 1 + src/components/info-button/info-button.scss | 2 +- src/components/join-flow/birthdate-step.jsx | 9 ++++++++- src/components/join-flow/email-step.jsx | 7 +++++++ src/components/join-flow/gender-step.jsx | 9 ++++++++- src/components/join-flow/join-flow-step.jsx | 6 ------ src/components/join-flow/join-flow-steps.scss | 15 +++++++++++++++ src/l10n.json | 5 ++--- static/svgs/info-button/info-button.svg | 2 +- 9 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/_colors.scss b/src/_colors.scss index 03ffef6f4..cc0d46c71 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -56,6 +56,7 @@ $transparent-light-blue: rgba(229, 240, 254, 0); $header-gray: hsla(225, 15, 40, 1); //#575E75 $type-gray: hsla(225, 15, 40, 1); //#575E75 $type-gray-75percent: hsla(225, 15, 40, .75); +$type-gray-60percent: hsla(225, 15, 40, .6); $type-white: hsla(0, 100, 100, 1); //#FFF $link-blue: $ui-blue; diff --git a/src/components/info-button/info-button.scss b/src/components/info-button/info-button.scss index 5daa65a26..c43117c11 100644 --- a/src/components/info-button/info-button.scss +++ b/src/components/info-button/info-button.scss @@ -8,7 +8,7 @@ height: 1rem; margin-left: .375rem; border-radius: 50%; - background-color: $ui-blue; + background-color: $type-gray-60percent; background-image: url("/svgs/info-button/info-button.svg"); background-size: cover; top: .125rem; diff --git a/src/components/join-flow/birthdate-step.jsx b/src/components/join-flow/birthdate-step.jsx index f722b50d6..9bdd7e770 100644 --- a/src/components/join-flow/birthdate-step.jsx +++ b/src/components/join-flow/birthdate-step.jsx @@ -4,9 +4,11 @@ const React = require('react'); const PropTypes = require('prop-types'); import {Formik} from 'formik'; const {injectIntl, intlShape} = require('react-intl'); +const FormattedMessage = require('react-intl').FormattedMessage; const FormikSelect = require('../../components/formik-forms/formik-select.jsx'); const JoinFlowStep = require('./join-flow-step.jsx'); +const InfoButton = require('../info-button/info-button.jsx'); require('./join-flow-steps.scss'); @@ -89,7 +91,6 @@ class BirthDateStep extends React.Component { description={this.props.intl.formatMessage({id: 'registration.private'})} descriptionClassName="join-flow-birthdate-description" headerImgSrc="/images/join-flow/birthdate-header.png" - infoMessage={this.props.intl.formatMessage({id: 'registration.birthDateStepInfo'})} innerClassName="join-flow-inner-birthdate-step" title={this.props.intl.formatMessage({id: 'registration.birthDateStepTitle'})} waiting={isSubmitting} @@ -133,6 +134,12 @@ class BirthDateStep extends React.Component { validationClassName="validation-birthdate-year" /> +
+ + +
); }} diff --git a/src/components/join-flow/email-step.jsx b/src/components/join-flow/email-step.jsx index 3da7ef5f1..96f14b1d7 100644 --- a/src/components/join-flow/email-step.jsx +++ b/src/components/join-flow/email-step.jsx @@ -10,6 +10,7 @@ const validate = require('../../lib/validate'); const JoinFlowStep = require('./join-flow-step.jsx'); const FormikInput = require('../../components/formik-forms/formik-input.jsx'); const FormikCheckbox = require('../../components/formik-forms/formik-checkbox.jsx'); +const InfoButton = require('../info-button/info-button.jsx'); require('./join-flow-steps.scss'); @@ -176,6 +177,12 @@ class EmailStep extends React.Component { /* eslint-enable react/jsx-no-bind */ onSetRef={this.handleSetEmailRef} /> +
+ + +
+
+ + +
); }} diff --git a/src/components/join-flow/join-flow-step.jsx b/src/components/join-flow/join-flow-step.jsx index 467a9ab4b..301d8652a 100644 --- a/src/components/join-flow/join-flow-step.jsx +++ b/src/components/join-flow/join-flow-step.jsx @@ -5,7 +5,6 @@ const PropTypes = require('prop-types'); const NextStepButton = require('./next-step-button.jsx'); const ModalTitle = require('../modal/base/modal-title.jsx'); const ModalInnerContent = require('../modal/base/modal-inner-content.jsx'); -const InfoButton = require('../info-button/info-button.jsx'); require('./join-flow-step.scss'); @@ -16,7 +15,6 @@ const JoinFlowStep = ({ descriptionClassName, footerContent, headerImgSrc, - infoMessage, nextButton, onSubmit, title, @@ -53,9 +51,6 @@ const JoinFlowStep = ({ )} > {description} - {infoMessage && ( - - )}
)} {children} @@ -80,7 +75,6 @@ JoinFlowStep.propTypes = { descriptionClassName: PropTypes.string, footerContent: PropTypes.oneOfType([PropTypes.string, PropTypes.node]), headerImgSrc: PropTypes.string, - infoMessage: PropTypes.string, innerClassName: PropTypes.string, nextButton: PropTypes.node, onSubmit: PropTypes.func, diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss index e4e71df6b..0b00b59cc 100644 --- a/src/components/join-flow/join-flow-steps.scss +++ b/src/components/join-flow/join-flow-steps.scss @@ -96,6 +96,13 @@ margin: 0 auto; } +.join-flow-privacy-message { + margin: 1rem auto; + font-size: .75rem; + font-weight: 500; + color: $type-gray-60percent; +} + .join-flow-inner-username-step { padding-top: 2.75rem; } @@ -132,6 +139,10 @@ margin-left: -.5rem; } +.join-flow-email-privacy { + margin-top: 0; +} + .join-flow-registration-error { padding-top: 5.5rem; } @@ -143,6 +154,10 @@ .join-flow-country-description { margin-top: 1rem; +.join-flow-gender-privacy { + margin-top: .5rem; +} + } .gender-radio-row { diff --git a/src/l10n.json b/src/l10n.json index a88926612..a09efcb19 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -165,12 +165,11 @@ "registration.createAccount": "Create Your Account", "registration.createUsername": "Create a username", "registration.genderStepTitle": "What's your gender?", - "registration.genderStepDescription": "Scratch welcomes people of all genders. We will always keep this information private.", + "registration.genderStepDescription": "Scratch welcomes people of all genders.", "registration.genderStepInfo": "This helps us understand who uses Scratch, so that we can broaden participation. This information will not be made public on your account.", "registration.genderOptionAnother": "Another gender:", "registration.genderOptionPreferNotToSay": "Prefer not to say", "registration.emailStepTitle": "What's your email?", - "registration.emailStepDescription": "We need this to finish creating your account. Scratch will always keep this information private.", "registration.goToClass": "Go to Class", "registration.invitedBy": "invited by", "registration.lastStepTitle": "Thank you for requesting a Scratch Teacher Account", @@ -185,7 +184,7 @@ "registration.passwordAdviceShort": "Write it down so you remember. Don’t share it with others!", "registration.personalStepTitle": "Personal Information", "registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure", - "registration.private": "Scratch will always keep this information private.", + "registration.private": "We will keep this information private.", "registration.receiveEmails": "I'd like to receive emails from the Scratch Team about project ideas, events, and more.", "registration.selectCountry": "select country", "registration.studentPersonalStepDescription": "This information will not appear on the Scratch website.", diff --git a/static/svgs/info-button/info-button.svg b/static/svgs/info-button/info-button.svg index 829bc9442..76edc37d8 100644 --- a/static/svgs/info-button/info-button.svg +++ b/static/svgs/info-button/info-button.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From ad3940555eddc425c13e8a5a8df18657b9147945 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Sun, 15 Sep 2019 17:09:57 -0400 Subject: [PATCH 03/23] remove descriptions from several join flow steps --- src/components/join-flow/birthdate-step.jsx | 2 -- src/components/join-flow/country-step.jsx | 2 -- src/components/join-flow/email-step.jsx | 1 - src/components/join-flow/join-flow-steps.scss | 5 ++--- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/join-flow/birthdate-step.jsx b/src/components/join-flow/birthdate-step.jsx index 9bdd7e770..81316fb71 100644 --- a/src/components/join-flow/birthdate-step.jsx +++ b/src/components/join-flow/birthdate-step.jsx @@ -88,8 +88,6 @@ class BirthDateStep extends React.Component { } = props; return ( Date: Sun, 15 Sep 2019 17:11:43 -0400 Subject: [PATCH 04/23] =?UTF-8?q?format=20each=20join=20flow=20title?= =?UTF-8?q?=E2=80=99s=20padding=20differently?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/join-flow/birthdate-step.jsx | 1 + src/components/join-flow/country-step.jsx | 1 + src/components/join-flow/email-step.jsx | 1 + src/components/join-flow/join-flow-step.jsx | 7 ++++++- src/components/join-flow/join-flow-steps.scss | 11 +++++++++++ src/l10n.json | 1 - 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/components/join-flow/birthdate-step.jsx b/src/components/join-flow/birthdate-step.jsx index 81316fb71..5f098bffc 100644 --- a/src/components/join-flow/birthdate-step.jsx +++ b/src/components/join-flow/birthdate-step.jsx @@ -91,6 +91,7 @@ class BirthDateStep extends React.Component { headerImgSrc="/images/join-flow/birthdate-header.png" innerClassName="join-flow-inner-birthdate-step" title={this.props.intl.formatMessage({id: 'registration.birthDateStepTitle'})} + titleClassName="join-flow-birthdate-title" waiting={isSubmitting} onSubmit={handleSubmit} > diff --git a/src/components/join-flow/country-step.jsx b/src/components/join-flow/country-step.jsx index f5f2c5e80..fbe53a7c4 100644 --- a/src/components/join-flow/country-step.jsx +++ b/src/components/join-flow/country-step.jsx @@ -71,6 +71,7 @@ class CountryStep extends React.Component { headerImgSrc="/images/join-flow/country-header.png" innerClassName="join-flow-inner-country-step" title={this.props.intl.formatMessage({id: 'registration.countryStepTitle'})} + titleClassName="join-flow-country-title" waiting={isSubmitting} onSubmit={handleSubmit} > diff --git a/src/components/join-flow/email-step.jsx b/src/components/join-flow/email-step.jsx index 268b782b3..f2d1e42a3 100644 --- a/src/components/join-flow/email-step.jsx +++ b/src/components/join-flow/email-step.jsx @@ -151,6 +151,7 @@ class EmailStep extends React.Component { innerClassName="join-flow-inner-email-step" nextButton={this.props.intl.formatMessage({id: 'registration.createAccount'})} title={this.props.intl.formatMessage({id: 'registration.emailStepTitle'})} + titleClassName="join-flow-email-title" waiting={this.props.waiting || isSubmitting || this.state.captchaIsLoading} onSubmit={handleSubmit} > diff --git a/src/components/join-flow/join-flow-step.jsx b/src/components/join-flow/join-flow-step.jsx index 301d8652a..27ff6afa8 100644 --- a/src/components/join-flow/join-flow-step.jsx +++ b/src/components/join-flow/join-flow-step.jsx @@ -18,6 +18,7 @@ const JoinFlowStep = ({ nextButton, onSubmit, title, + titleClassName, waiting }) => (
@@ -39,7 +40,10 @@ const JoinFlowStep = ({ > {title && ( )} @@ -79,6 +83,7 @@ JoinFlowStep.propTypes = { nextButton: PropTypes.node, onSubmit: PropTypes.func, title: PropTypes.string, + titleClassName: PropTypes.string, waiting: PropTypes.bool }; diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss index b7ac979e8..59075f9f5 100644 --- a/src/components/join-flow/join-flow-steps.scss +++ b/src/components/join-flow/join-flow-steps.scss @@ -133,6 +133,10 @@ padding-top: 3rem; } +.join-flow-birthdate-title { + margin-bottom: 2.875rem; +} + .join-flow-birthdate-description { margin-top: 1.25rem; margin-right: -.5rem; @@ -140,6 +144,10 @@ margin-left: -.5rem; } +.join-flow-email-title { + margin-bottom: 2rem; +} + .join-flow-email-privacy { margin-top: 0; } @@ -157,6 +165,9 @@ margin-top: .5rem; } +.join-flow-country-title { + margin-top: 0; + margin-bottom: 1.75rem; } .gender-radio-row { diff --git a/src/l10n.json b/src/l10n.json index a09efcb19..dbe3875ff 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -154,7 +154,6 @@ "registration.choosePasswordStepTitle": "Create a password", "registration.choosePasswordStepTooltip": "Don't use your name or anything that's easy for someone else to guess.", "registration.classroomApiGeneralError": "Sorry, we could not find the registration information for this class", - "registration.countryStepDescription": "We’ll display your country on your profile.", "registration.countryStepTitle": "What country do you live in?", "registration.generalError": "Sorry, an unexpected error occurred.", "registration.classroomInviteExistingStudentStepDescription": "you have been invited to join the class:", From b82787fc6d24a5b661df20ce4cd7171fd0334c20 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Sun, 15 Sep 2019 17:12:57 -0400 Subject: [PATCH 05/23] move info button down, and give its message a shadow --- src/components/info-button/info-button.jsx | 2 +- src/components/info-button/info-button.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/info-button/info-button.jsx b/src/components/info-button/info-button.jsx index f79890c05..818af0451 100644 --- a/src/components/info-button/info-button.jsx +++ b/src/components/info-button/info-button.jsx @@ -26,7 +26,7 @@ class InfoButton extends React.Component { } render () { const messageJsx = this.state.visible && ( -
+
{this.props.message}
); diff --git a/src/components/info-button/info-button.scss b/src/components/info-button/info-button.scss index 5daa65a26..a989eb694 100644 --- a/src/components/info-button/info-button.scss +++ b/src/components/info-button/info-button.scss @@ -11,7 +11,7 @@ background-color: $ui-blue; background-image: url("/svgs/info-button/info-button.svg"); background-size: cover; - top: .125rem; + top: .1875rem; } .info-button-message { From 4341d364d49d7718fc9d3053553b4ff1dbf62dda Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Sun, 15 Sep 2019 17:22:25 -0400 Subject: [PATCH 06/23] adjust email step vertical spacing, redo its footer --- src/components/join-flow/join-flow-step.jsx | 20 ++++++++++--------- src/components/join-flow/join-flow-step.scss | 2 +- src/components/join-flow/join-flow-steps.scss | 6 ++++-- src/l10n.json | 1 + 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/components/join-flow/join-flow-step.jsx b/src/components/join-flow/join-flow-step.jsx index 27ff6afa8..d26e35d03 100644 --- a/src/components/join-flow/join-flow-step.jsx +++ b/src/components/join-flow/join-flow-step.jsx @@ -60,15 +60,17 @@ const JoinFlowStep = ({ {children}
- {footerContent && ( -
- {footerContent} -
- )} - +
+ {footerContent && ( +
+ {footerContent} +
+ )} + +
); diff --git a/src/components/join-flow/join-flow-step.scss b/src/components/join-flow/join-flow-step.scss index 1b13cbec6..5c27e4253 100644 --- a/src/components/join-flow/join-flow-step.scss +++ b/src/components/join-flow/join-flow-step.scss @@ -50,7 +50,7 @@ .join-flow-footer-message { width: 100%; - padding: 1.125rem 1.5rem 1.125rem; + padding: 0.875rem 1.5rem; background-color: $ui-blue-25percent; font-size: .75rem; font-weight: 600; diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss index 59075f9f5..7ca7f800b 100644 --- a/src/components/join-flow/join-flow-steps.scss +++ b/src/components/join-flow/join-flow-steps.scss @@ -126,7 +126,9 @@ } .join-flow-inner-email-step { - padding-top: 3rem; + padding-top: 1.25rem; + padding-bottom: 0; + min-height: 16.625rem; } .join-flow-inner-welcome-step { @@ -203,7 +205,7 @@ .join-flow-email-checkbox-row { font-size: .75rem; - margin: .25rem .125rem; + margin: 1.5rem .125rem .25rem; } a.join-flow-link:link, a.join-flow-link:visited, a.join-flow-link:active { diff --git a/src/l10n.json b/src/l10n.json index dbe3875ff..daaee1082 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -169,6 +169,7 @@ "registration.genderOptionAnother": "Another gender:", "registration.genderOptionPreferNotToSay": "Prefer not to say", "registration.emailStepTitle": "What's your email?", + "registration.emailStepInfo": "NEED EMAIL STEP HERE", "registration.goToClass": "Go to Class", "registration.invitedBy": "invited by", "registration.lastStepTitle": "Thank you for requesting a Scratch Teacher Account", From c08c9f8802cab4870b94ec6df5912a3c99fa2841 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Sun, 15 Sep 2019 21:38:09 -0400 Subject: [PATCH 07/23] country step adjust spacing --- src/components/join-flow/join-flow-steps.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss index 7ca7f800b..654d57f08 100644 --- a/src/components/join-flow/join-flow-steps.scss +++ b/src/components/join-flow/join-flow-steps.scss @@ -121,8 +121,8 @@ } .join-flow-inner-country-step { - padding-top: 1rem; - padding-bottom: 2rem; + padding-top: 0; + padding-bottom: 2.5rem; } .join-flow-inner-email-step { From 148d1914dd3288da2bfa3ae72fa4017801055dad Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Sun, 15 Sep 2019 21:41:05 -0400 Subject: [PATCH 08/23] remove unused class --- src/components/join-flow/birthdate-step.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/join-flow/birthdate-step.jsx b/src/components/join-flow/birthdate-step.jsx index 5f098bffc..e22c7f22c 100644 --- a/src/components/join-flow/birthdate-step.jsx +++ b/src/components/join-flow/birthdate-step.jsx @@ -133,7 +133,7 @@ class BirthDateStep extends React.Component { validationClassName="validation-birthdate-year" /> -
+
Date: Sun, 15 Sep 2019 21:41:27 -0400 Subject: [PATCH 09/23] update email privacy info string --- src/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/l10n.json b/src/l10n.json index daaee1082..f89c2745a 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -169,7 +169,7 @@ "registration.genderOptionAnother": "Another gender:", "registration.genderOptionPreferNotToSay": "Prefer not to say", "registration.emailStepTitle": "What's your email?", - "registration.emailStepInfo": "NEED EMAIL STEP HERE", + "registration.emailStepInfo": "This will help if you forget your password, or if you want updates in your inbox. This information will not be made public on your account.", "registration.goToClass": "Go to Class", "registration.invitedBy": "invited by", "registration.lastStepTitle": "Thank you for requesting a Scratch Teacher Account", From c26d37442d24cee0c5c1ae858247d14bd5b0e18f Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 11:46:44 -0400 Subject: [PATCH 10/23] revised email info string --- src/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/l10n.json b/src/l10n.json index f89c2745a..0a3b6f8bc 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -169,7 +169,7 @@ "registration.genderOptionAnother": "Another gender:", "registration.genderOptionPreferNotToSay": "Prefer not to say", "registration.emailStepTitle": "What's your email?", - "registration.emailStepInfo": "This will help if you forget your password, or if you want updates in your inbox. This information will not be made public on your account.", + "registration.emailStepInfo": "This will help if you forget your password, or if you want to receive email updates. This information will not be made public on your account.", "registration.goToClass": "Go to Class", "registration.invitedBy": "invited by", "registration.lastStepTitle": "Thank you for requesting a Scratch Teacher Account", From c6d39b7509f71fd37baad9636258a460ee2dc5a7 Mon Sep 17 00:00:00 2001 From: rschamp Date: Mon, 16 Sep 2019 12:07:43 -0400 Subject: [PATCH 11/23] Remove tagline from site footer --- src/components/footer/conference/2016/footer.jsx | 3 --- src/components/footer/conference/2017/footer.jsx | 3 --- src/components/footer/conference/2018/footer.jsx | 3 --- src/components/footer/conference/2019/footer.jsx | 3 --- src/components/footer/www/footer.jsx | 6 ------ src/l10n.json | 2 -- 6 files changed, 20 deletions(-) diff --git a/src/components/footer/conference/2016/footer.jsx b/src/components/footer/conference/2016/footer.jsx index ceee35eab..72de94201 100644 --- a/src/components/footer/conference/2016/footer.jsx +++ b/src/components/footer/conference/2016/footer.jsx @@ -103,9 +103,6 @@ const ConferenceFooter = () => ( -

- Scratch is a project of the Lifelong Kindergarten Group at the MIT Media Lab. -

diff --git a/src/components/footer/conference/2017/footer.jsx b/src/components/footer/conference/2017/footer.jsx index d4cac9e68..a75e2ca44 100644 --- a/src/components/footer/conference/2017/footer.jsx +++ b/src/components/footer/conference/2017/footer.jsx @@ -46,9 +46,6 @@ const ConferenceFooter = props => ( -

- -

diff --git a/src/components/footer/conference/2018/footer.jsx b/src/components/footer/conference/2018/footer.jsx index d87e4bad9..5cef2bde2 100644 --- a/src/components/footer/conference/2018/footer.jsx +++ b/src/components/footer/conference/2018/footer.jsx @@ -145,9 +145,6 @@ const ConferenceFooter = props => ( -

- -

diff --git a/src/components/footer/conference/2019/footer.jsx b/src/components/footer/conference/2019/footer.jsx index 82447b071..ab27b268f 100644 --- a/src/components/footer/conference/2019/footer.jsx +++ b/src/components/footer/conference/2019/footer.jsx @@ -49,9 +49,6 @@ const ConferenceFooter = props => ( -

- -

diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx index c6018f70a..ad5f4c4b9 100644 --- a/src/components/footer/www/footer.jsx +++ b/src/components/footer/www/footer.jsx @@ -209,12 +209,6 @@ const Footer = props => (
- -
-

- -

-
); diff --git a/src/l10n.json b/src/l10n.json index 555cbbe39..8f744f772 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -16,8 +16,6 @@ "general.downloadPDF": "Download PDF", "general.emailUs": "Email Us", "general.conferences": "Conferences", - "general.copyright": "Scratch is a project of the Lifelong Kindergarten Group at the MIT Media Lab", - "general.copyrightDraft": "Scratch is a project of the Scratch Foundation in collaboration with the Lifelong Kindergarten Group at the MIT Media Lab.", "general.country": "Country", "general.create": "Create", "general.credits": "Credits", From e95cd8e3d579b7a73712bd047b317139e4ece221 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 17:00:32 -0400 Subject: [PATCH 12/23] moved validation info box shadow, font weight into info-button-message class --- src/components/info-button/info-button.jsx | 2 +- src/components/info-button/info-button.scss | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/info-button/info-button.jsx b/src/components/info-button/info-button.jsx index 818af0451..f79890c05 100644 --- a/src/components/info-button/info-button.jsx +++ b/src/components/info-button/info-button.jsx @@ -26,7 +26,7 @@ class InfoButton extends React.Component { } render () { const messageJsx = this.state.visible && ( -
+
{this.props.message}
); diff --git a/src/components/info-button/info-button.scss b/src/components/info-button/info-button.scss index a989eb694..b26121f0d 100644 --- a/src/components/info-button/info-button.scss +++ b/src/components/info-button/info-button.scss @@ -26,6 +26,7 @@ margin-left: $arrow-border-width; border: 1px solid $active-gray; border-radius: 5px; + box-shadow: 0 0 4px 2px rgba(0, 0, 0, .15); padding: .75rem; overflow: visible; background-color: $ui-blue; @@ -33,6 +34,7 @@ line-height: 1.25rem; text-align: left; font-size: .875rem; + font-weight: 500; z-index: 2; &:before { From 20850da2c96551ebd3722f5694a0f22649ead537 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2019 23:12:29 +0000 Subject: [PATCH 13/23] chore(package): update scratch-gui to version 0.1.0-prerelease.20190916225740 Closes #3346 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b1735e83..bbc940430 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20190912180550", + "scratch-gui": "0.1.0-prerelease.20190916225740", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 5c6f94e5ba272455882edd4c47f025b055557313 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2019 23:12:33 +0000 Subject: [PATCH 14/23] chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 636680aed..befb5f5d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15561,9 +15561,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20190912180550", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190912180550.tgz", - "integrity": "sha512-FPOuX1Za4vNAhOJfViEigGJ5t+dWzebgrUQWAvJDwrkhfKKHD2VE9vtaGH6H+6NNZIdW+2qcSqBPxutevdHlyA==", + "version": "0.1.0-prerelease.20190916225740", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190916225740.tgz", + "integrity": "sha512-f0kLGcge5Je7LL4FJmkuRwIvI4JptC/osmvBZBdYboPlpJ5TXNyi6pgQSCCdg+P9X0VlcL/sZjkFDAXCGtW2gw==", "dev": true }, "scratch-l10n": { From de4077773a41e5d3ad1a84c801d67a560c8a61b4 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 20:12:42 -0400 Subject: [PATCH 15/23] updated email-step test --- test/unit/components/email-step.test.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/components/email-step.test.jsx b/test/unit/components/email-step.test.jsx index 88af9b8b2..b49ae09c6 100644 --- a/test/unit/components/email-step.test.jsx +++ b/test/unit/components/email-step.test.jsx @@ -25,12 +25,12 @@ describe('EmailStep test', () => { // Dive to get past the anonymous component. const joinFlowWrapper = formikWrapper.dive().find(JoinFlowStep); expect(joinFlowWrapper).toHaveLength(1); - expect(joinFlowWrapper.props().description).toBe('registration.emailStepDescription'); expect(joinFlowWrapper.props().footerContent.props.id).toBe('registration.acceptTermsOfUse'); expect(joinFlowWrapper.props().headerImgSrc).toBe('/images/join-flow/email-header.png'); expect(joinFlowWrapper.props().innerClassName).toBe('join-flow-inner-email-step'); expect(joinFlowWrapper.props().nextButton).toBe('registration.createAccount'); expect(joinFlowWrapper.props().title).toBe('registration.emailStepTitle'); + expect(joinFlowWrapper.props().titleClassName).toBe('join-flow-email-title'); expect(joinFlowWrapper.props().waiting).toBe(true); }); From c034c6c70155d15c06697f3c2e75fab61cae34b8 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 21:45:11 -0400 Subject: [PATCH 16/23] make sure correct input css is used for formik input --- src/components/formik-forms/formik-input.jsx | 2 +- src/components/formik-forms/formik-input.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/formik-forms/formik-input.jsx b/src/components/formik-forms/formik-input.jsx index e1287b2d7..7f161e3ad 100644 --- a/src/components/formik-forms/formik-input.jsx +++ b/src/components/formik-forms/formik-input.jsx @@ -27,7 +27,7 @@ const FormikInput = ({ > Date: Mon, 16 Sep 2019 21:45:26 -0400 Subject: [PATCH 17/23] disable birthdate placeholders --- src/components/join-flow/birthdate-step.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/join-flow/birthdate-step.jsx b/src/components/join-flow/birthdate-step.jsx index e22c7f22c..4ed3405b9 100644 --- a/src/components/join-flow/birthdate-step.jsx +++ b/src/components/join-flow/birthdate-step.jsx @@ -13,7 +13,7 @@ const InfoButton = require('../info-button/info-button.jsx'); require('./join-flow-steps.scss'); const getBirthMonthOptions = intl => ([ - {value: 'null', label: intl.formatMessage({id: 'general.month'})}, + {value: 'null', label: intl.formatMessage({id: 'general.month'}), disabled: true}, {value: '1', label: intl.formatMessage({id: 'general.monthJanuary'})}, {value: '2', label: intl.formatMessage({id: 'general.monthFebruary'})}, {value: '3', label: intl.formatMessage({id: 'general.monthMarch'})}, @@ -37,7 +37,8 @@ const getBirthYearOptions = intl => { .map((defaultVal, i) => ( {value: String(curYear - i), label: String(curYear - i)} )); - birthYearOptions.unshift({ + birthYearOptions.unshift({ // set placeholder as first option + disabled: true, value: 'null', label: intl.formatMessage({id: 'general.year'}) }); From 87e8b18ab1cd9c85931d8e816d5af681e41266af Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 21:45:45 -0400 Subject: [PATCH 18/23] comment placeholder option --- src/components/join-flow/country-step.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/join-flow/country-step.jsx b/src/components/join-flow/country-step.jsx index fbe53a7c4..9d44379fe 100644 --- a/src/components/join-flow/country-step.jsx +++ b/src/components/join-flow/country-step.jsx @@ -28,7 +28,7 @@ class CountryStep extends React.Component { setCountryOptions () { if (this.countryOptions.length === 0) { this.countryOptions = [...countryData.registrationCountryOptions]; - this.countryOptions.unshift({ + this.countryOptions.unshift({ // add placeholder as first option disabled: true, label: this.props.intl.formatMessage({id: 'general.country'}), value: 'null' From 8f45c12b8968a796a9e3c9e2765b1c5c29b78281 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 16 Sep 2019 21:49:06 -0400 Subject: [PATCH 19/23] 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} > From 8d9b524a536ada17de545a78614feba66e19b95a Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2019 18:49:18 +0000 Subject: [PATCH 20/23] chore(package): update scratch-gui to version 0.1.0-prerelease.20190917180819 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbc940430..4baf2f3c3 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20190916225740", + "scratch-gui": "0.1.0-prerelease.20190917180819", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 6e0ef22f0011a5dc564b9136d0421ea0c7b4c022 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2019 18:49:23 +0000 Subject: [PATCH 21/23] chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index befb5f5d6..15ace6e85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15561,9 +15561,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20190916225740", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190916225740.tgz", - "integrity": "sha512-f0kLGcge5Je7LL4FJmkuRwIvI4JptC/osmvBZBdYboPlpJ5TXNyi6pgQSCCdg+P9X0VlcL/sZjkFDAXCGtW2gw==", + "version": "0.1.0-prerelease.20190917180819", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190917180819.tgz", + "integrity": "sha512-m6TFvwzvAh4dBrAnsBjCeKTYes60Y2X+WsRs978AB/hZ2AA4xTqCXOm0relmIwdAPotCY3pk2izkLlJn/IEv9Q==", "dev": true }, "scratch-l10n": { From 38b03eda1058e1f5be4eac909ba5d6ffeffe6932 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 16:52:40 +0000 Subject: [PATCH 22/23] chore(package): update scratch-gui to version 0.1.0-prerelease.20190918163722 Closes #3368 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4baf2f3c3..cd265563a 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20190917180819", + "scratch-gui": "0.1.0-prerelease.20190918163722", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 7b2e2e2b1737bca0488316228a89ee34057a7e36 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 16:52:44 +0000 Subject: [PATCH 23/23] chore(package): update lockfile package-lock.json --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15ace6e85..a70ed6992 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15561,15 +15561,15 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20190917180819", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190917180819.tgz", - "integrity": "sha512-m6TFvwzvAh4dBrAnsBjCeKTYes60Y2X+WsRs978AB/hZ2AA4xTqCXOm0relmIwdAPotCY3pk2izkLlJn/IEv9Q==", + "version": "0.1.0-prerelease.20190918163722", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190918163722.tgz", + "integrity": "sha512-2BM65eEvknpgrlkZgYP31H4v4rUsYuacY2NBBLwZ+zBScIsYMrfuxr2zPtvtxOkjYf9yH6TJef8/i/YZmPtfhw==", "dev": true }, "scratch-l10n": { - "version": "3.5.20190910223701", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.5.20190910223701.tgz", - "integrity": "sha512-WArZ1OZZz8KcTyEHcUnRJJE6gyh3CDcZ3KYxK8TNoHqzdLi+Gl/1QR/Xs+rJ1U587hnI2JLRfhFfvVPwsdmZag==", + "version": "3.5.20190917223712", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.5.20190917223712.tgz", + "integrity": "sha512-kWkeUD5An4RwbAVZU7OUqS25D1rrdI73ZYhNn3tQhGu545JaITZf37AvVQW4DyZU+wFHQ1G30nWls7bXZLEPbA==", "dev": true, "requires": { "@babel/cli": "^7.1.2",