scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #3274 from benjiwheeler/join-flow-misc

Browse source 
Join flow misc UI improvements
This commit is contained in:
Benjamin Wheeler 2019-08-21 01:40:16 +02:00 committed by GitHub
commit ae8f5a1e90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/join-flow/birthdate-step.jsx
View file

@ -87,6 +87,7 @@ class BirthDateStep extends React.Component {
return (
<JoinFlowStep
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"

2
src/components/join-flow/country-step.jsx
View file

@ -29,7 +29,7 @@ class CountryStep extends React.Component {
this.countryOptions = [...countryData.registrationCountryOptions];
this.countryOptions.unshift({
disabled: true,
label: this.props.intl.formatMessage({id: 'registration.selectCountry'}),
label: this.props.intl.formatMessage({id: 'general.country'}),
value: 'null'
});
}

11
src/components/join-flow/join-flow-steps.scss
View file

@ -101,6 +101,11 @@
padding-top: 3rem;
}
.join-flow-birthdate-description {
margin-left: -.5rem;
margin-right: -.5rem;
}
.join-flow-gender-description {
margin-top: .625rem;
margin-bottom: 1.25rem;
@ -118,7 +123,11 @@
align-items: center;
}
.gender-radio-row-selected {
.gender-radio-row:hover {
background-color: $ui-blue-10percent;
}
.gender-radio-row-selected, .gender-radio-row-selected:hover {
transition: all .125s ease;
background-color: $ui-blue-25percent;
}