);
@@ -80,11 +81,11 @@ 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,
title: PropTypes.string,
+ titleClassName: PropTypes.string,
waiting: PropTypes.bool
};
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 e4e71df6b..abddb3b99 100644
--- a/src/components/join-flow/join-flow-steps.scss
+++ b/src/components/join-flow/join-flow-steps.scss
@@ -66,11 +66,12 @@
.select .join-flow-select {
height: 3.5rem;
+ margin-bottom: 0; // override default for select
+ padding-right: 3.25rem;
background-color: white;
border-color: $box-shadow-light-gray;
font-size: 1rem;
font-weight: 500;
- padding-right: 3.25rem;
}
.select .join-flow-select-month {
@@ -96,6 +97,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;
}
@@ -113,23 +121,31 @@
}
.join-flow-inner-country-step {
- padding-top: 1rem;
- padding-bottom: 2rem;
+ padding-top: 0;
+ padding-bottom: 2.5rem;
}
.join-flow-inner-email-step {
- padding-top: 3rem;
+ padding-top: 1.25rem;
+ padding-bottom: 0;
+ min-height: 16.625rem;
}
.join-flow-inner-welcome-step {
- padding-top: 3rem;
+ padding-top: 0;
+ padding-bottom: 1rem;
}
-.join-flow-birthdate-description {
- margin-top: 1.25rem;
- margin-right: -.5rem;
+.join-flow-birthdate-title {
+ margin-bottom: 2.875rem;
+}
+
+.join-flow-email-title {
margin-bottom: 2rem;
- margin-left: -.5rem;
+}
+
+.join-flow-email-privacy {
+ margin-top: 0;
}
.join-flow-registration-error {
@@ -141,8 +157,21 @@
margin-bottom: 1.25rem;
}
-.join-flow-country-description {
- margin-top: 1rem;
+.join-flow-gender-privacy {
+ margin-top: .5rem;
+}
+
+.join-flow-country-title {
+ margin-top: 0;
+ margin-bottom: 1.75rem;
+}
+
+.join-flow-welcome-title {
+ margin-bottom: .25rem;
+}
+
+.join-flow-welcome-description {
+ margin-bottom: 1.25rem;
}
.gender-radio-row {
@@ -178,7 +207,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/components/join-flow/join-flow.jsx b/src/components/join-flow/join-flow.jsx
index 93554102d..6b18d6a40 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 {
) : (
+
-
diff --git a/src/l10n.json b/src/l10n.json
index a88926612..9b9032b7a 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",
@@ -154,7 +152,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:",
@@ -165,12 +162,12 @@
"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.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",
@@ -185,7 +182,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
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);
});