scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #610 from mewtaylor/cleanup/teacher-styling

Browse source 
styling cleanup for teacher registration
This commit is contained in:
Matthew Taylor 2016-06-24 11:25:25 -04:00 committed by GitHub
commit ef881a07f9
7 changed files with 194 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

197
src/components/deck/deck.scss
View file

@ -14,141 +14,138 @@
.step-navigation { .step-navigation {
margin-top: 2rem; margin-top: 2rem;
} text-align: center;
}
.slide {
max-width: 28.75rem;
h2,
p {
text-align: center;
color: $type-white;
} }
.description { .slide {
margin-top: 0; max-width: 28.75rem;
margin-bottom: 2rem;
h2,
.description {
text-align: center;
color: $type-white;
}
.description {
margin-top: 0;
margin-bottom: 2rem;
}
} }
}
.card { .card {
margin: 0 auto; margin: 0 auto;
width: 23.75rem; width: 23.75rem;
&,
h2,
p {
color: $type-gray;
} }
}
.step-navigation { .form {
text-align: center; padding: 3rem 4rem;
}
.form { .form-group {
padding: 3rem 4rem; margin-bottom: 1.2rem;
.form-group { &.has-error {
margin-bottom: 1.2rem; .input {
border: 1px solid $ui-orange;
}
}
}
&.has-error { .button {
.input { margin: 0 0 -3rem -4rem;
border: 1px solid $ui-orange; border-radius: .5rem;
box-shadow: none;
width: 23.75rem;
height: 4rem;
&.card-button {
display: block;
border-top-left-radius: 0;
border-top-right-radius: 0;
background-color: $ui-aqua;
}
&:hover {
box-shadow: none;
} }
} }
} }
.button { .input {
margin: 0 0 -3rem -4rem; width: $cols5;
border-radius: .5rem;
box-shadow: none;
width: 23.75rem;
height: 4rem;
&.card-button {
display: block;
border-top-left-radius: 0;
border-top-right-radius: 0;
background-color: $ui-aqua;
}
&:hover {
box-shadow: none;
}
} }
}
.input { .help-block {
width: $cols5; $arrow-border-width: 1rem;
}
.help-block {
$arrow-border-width: 1rem;
display: block;
position: absolute;
margin-left: $arrow-border-width;
border: 1px solid $active-gray;
border-radius: 5px;
background-color: $ui-orange;
padding: 1rem;
max-width: 18.75rem;
min-height: 1rem;
max-height: 3rem;
overflow: visible;
color: $type-white;
&:before {
display: block; display: block;
position: absolute; position: absolute;
top: 1rem; margin-left: $arrow-border-width;
left: -$arrow-border-width / 2; border: 1px solid $active-gray;
transform: rotate(45deg);
border-bottom: 1px solid $active-gray;
border-left: 1px solid $active-gray;
border-radius: 5px; border-radius: 5px;
background-color: $ui-orange; background-color: $ui-orange;
width: $arrow-border-width; padding: 1rem;
height: $arrow-border-width; max-width: 18.75rem;
min-height: 1rem;
max-height: 3rem;
overflow: visible;
color: $type-white;
content: ""; &:before {
display: block;
position: absolute;
top: 1rem;
left: -$arrow-border-width / 2;
transform: rotate(45deg);
border-bottom: 1px solid $active-gray;
border-left: 1px solid $active-gray;
border-radius: 5px;
background-color: $ui-orange;
width: $arrow-border-width;
height: $arrow-border-width;
content: "";
}
} }
} }
@media only screen and (max-width: $mobile - 1) { @media only screen and (max-width: $mobile - 1) {
.card { .deck {
width: 22.5rem; .card {
}
.form {
text-align: left;
.button {
width: 22.5rem; width: 22.5rem;
} }
.form {
text-align: left;
.button {
width: 22.5rem;
}
}
} }
} }
@media only screen and (max-width: $tablet - 1) { @media only screen and (max-width: $tablet - 1) {
.input { .deck {
width: 90%; .input {
width: 90%;
}
} }
} }
@media only screen and (max-width: $desktop - 1) { @media only screen and (max-width: $desktop - 1) {
.help-block { .deck {
position: relative; .help-block {
transform: none; position: relative;
margin: inherit; transform: none;
width: 100%; margin: inherit;
height: inherit; width: 100%;
height: inherit;
&:before { &:before {
display: none; display: none;
}
} }
} }
} }

14
src/components/forms/charcount.scss
View file

@ -1,13 +1,11 @@
@import "../../colors"; @import "../../colors";
p { .char-count {
&.char-count { letter-spacing: 1px;
letter-spacing: 1px; color: lighten($type-gray, 30%);
color: lighten($type-gray, 30%); font-weight: 500;
font-weight: 500;
&.overmax { &.overmax {
color: $ui-orange; color: $ui-orange;
}
} }
} }

10
src/components/forms/checkbox-group.scss
View file

@ -1,9 +1,11 @@
.checkbox-group { .checkbox-group {
.col-sm-9 { .row {
flex-flow: column wrap; .col-sm-9 {
flex-flow: column wrap;
.checkbox { .checkbox {
margin: .5rem 0; margin: .5rem 0;
}
} }
} }
} }

54
src/components/forms/checkbox.scss
View file

@ -6,37 +6,37 @@
label { label {
font-weight: 300; font-weight: 300;
} }
}
}
input { input {
&[type=checkbox] { &[type=checkbox] {
display: block; display: block;
float: left; float: left;
margin-right: 1rem; margin-right: 1rem;
border: 1px solid $active-gray; border: 1px solid $active-gray;
border-radius: 3px; border-radius: 3px;
width: 1.25rem; width: 1.25rem;
height: 1.25rem; height: 1.25rem;
appearance: none; appearance: none;
&:checked, &:checked,
&:focus { &:focus {
outline: none; outline: none;
} }
&:checked { &:checked {
transition: all .5s ease; transition: all .5s ease;
box-shadow: 0 0 0 .25rem $active-gray; box-shadow: 0 0 0 .25rem $active-gray;
background-color: $ui-blue; background-color: $ui-blue;
text-align: center; text-align: center;
text-indent: .125rem; text-indent: .125rem;
line-height: 1.25rem; line-height: 1.25rem;
font-size: .75rem; font-size: .75rem;
&:after { &:after {
color: $type-white; color: $type-white;
content: "\2714"; content: "\2714";
}
}
} }
} }
} }

56
src/components/forms/radio-group.scss
View file

@ -6,39 +6,39 @@
font-weight: 300; font-weight: 300;
} }
} }
}
.col-sm-9 { .col-sm-9 {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
input { input {
&[type="radio"] { &[type="radio"] {
margin-top: 1px; margin-top: 1px;
border: 1px solid $active-gray; border: 1px solid $active-gray;
border-radius: 50%; border-radius: 50%;
width: .875rem; width: .875rem;
height: .875rem; height: .875rem;
appearance: none; appearance: none;
&:checked, &:checked,
&:focus { &:focus {
outline: none; outline: none;
} }
&:checked { &:checked {
transition: all .25s ease; transition: all .25s ease;
box-shadow: 0 0 0 .25rem $active-gray; box-shadow: 0 0 0 .25rem $active-gray;
background-color: $ui-blue; background-color: $ui-blue;
&:after { &:after {
display: block; display: block;
transform: translate(.25rem, .25rem); transform: translate(.25rem, .25rem);
border-radius: 50%; border-radius: 50%;
background-color: $ui-white; background-color: $ui-white;
width: .25rem; width: .25rem;
height: .25rem; height: .25rem;
content: ""; content: "";
}
} }
} }
} }

52
src/components/forms/select.scss
View file

@ -5,34 +5,34 @@
label { label {
font-weight: 500; font-weight: 500;
} }
}
select { select {
transition: all .5s ease;
margin: .75rem 0;
border: 1px solid $active-gray;
border-radius: 5px;
background: $ui-light-gray url("../../../static/svgs/forms/carot.svg") no-repeat right center;
padding-right: 4rem;
width: 100%;
height: 3rem;
text-indent: 1rem;
font-size: .875rem;
appearance: none;
&:focus {
transition: all .5s ease; transition: all .5s ease;
outline: none; margin: .75rem 0;
border: 1px solid $ui-blue; border: 1px solid $active-gray;
} border-radius: 5px;
background: $ui-light-gray url("../../../static/svgs/forms/carot.svg") no-repeat right center;
&:focus, padding-right: 4rem;
&:hover {
background: $ui-light-gray url("../../../static/svgs/forms/carot-hover.svg") no-repeat right center;
}
> option {
background-color: $ui-white;
width: 100%; width: 100%;
height: 3rem;
text-indent: 1rem;
font-size: .875rem;
appearance: none;
&:focus {
transition: all .5s ease;
outline: none;
border: 1px solid $ui-blue;
}
&:focus,
&:hover {
background: $ui-light-gray url("../../../static/svgs/forms/carot-hover.svg") no-repeat right center;
}
> option {
background-color: $ui-white;
width: 100%;
}
} }
} }

8
src/components/registration/steps.jsx
View file

@ -291,7 +291,7 @@ module.exports = {
<h2> <h2>
<intl.FormattedMessage id="teacherRegistration.phoneStepTitle" /> <intl.FormattedMessage id="teacherRegistration.phoneStepTitle" />
</h2> </h2>
<p> <p className="description">
<intl.FormattedMessage id="teacherRegistration.phoneStepDescription" /> <intl.FormattedMessage id="teacherRegistration.phoneStepDescription" />
<Tooltip title={'?'} <Tooltip title={'?'}
tipContent={formatMessage({id: 'teacherRegistration.nameStepTooltip'})} /> tipContent={formatMessage({id: 'teacherRegistration.nameStepTooltip'})} />
@ -359,7 +359,7 @@ module.exports = {
<h2> <h2>
<intl.FormattedMessage id="teacherRegistration.orgStepTitle" /> <intl.FormattedMessage id="teacherRegistration.orgStepTitle" />
</h2> </h2>
<p> <p className="description">
<intl.FormattedMessage id="teacherRegistration.orgStepDescription" /> <intl.FormattedMessage id="teacherRegistration.orgStepDescription" />
<Tooltip title={'?'} <Tooltip title={'?'}
tipContent={formatMessage({id: 'teacherRegistration.nameStepTooltip'})} /> tipContent={formatMessage({id: 'teacherRegistration.nameStepTooltip'})} />
@ -448,7 +448,7 @@ module.exports = {
return this.props.onNextStep(formData); return this.props.onNextStep(formData);
} else { } else {
return invalidate({ return invalidate({
'all': <FormattedMessage id="teacherRegistration.addressValidationError" /> 'all': <intl.FormattedMessage id="teacherRegistration.addressValidationError" />
}); });
} }
}.bind(this)); }.bind(this));
@ -693,7 +693,7 @@ module.exports = {
<Slide className="error-step"> <Slide className="error-step">
<h2>Something went wrong</h2> <h2>Something went wrong</h2>
<Card> <Card>
<h2>There was an error while processing your registration</h2> <h4>There was an error while processing your registration</h4>
<p> <p>
{this.props.registrationError} {this.props.registrationError}
</p> </p>