Skip to content

GitLab

S
scratch-www
Commit 4083479c authored by Ray Schamp's avatar Ray Schamp Committed by GitHub
Browse files
Options

Merge pull request #944 from LLK/release/2.2.13 

[Develop] Release 2.2.13
parents 5245e931 6bcc7eea
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 32 deletions
src/components/forms/row.scss
View file @ 4083479c
...@@ -20,3 +20,8 @@ ...@@ -20,3 +20,8 @@
} }
} }
} }
.row-label {
margin-bottom: .75rem;
line-height: 1.7rem;
}
src/components/registration/steps.jsx
View file @ 4083479c
...@@ -741,8 +741,15 @@ module.exports = { ...@@ -741,8 +741,15 @@ module.exports = {
required /> : required /> :
[] []
} }
<Input label={formatMessage({id: 'teacherRegistration.zipCode'})} <b className="row-label">
type="text" <intl.FormattedMessage id="teacherRegistration.zipCode" />
</b>
{this.state.countryChoice !== 'us' ?
<p className="help-text">
<intl.FormattedMessage id="teacherRegistration.notRequired" />
</p> : []
}
<Input type="text"
name="address.zip" name="address.zip"
validations={{ validations={{
maxLength: 10 maxLength: 10
...@@ -752,7 +759,7 @@ module.exports = { ...@@ -752,7 +759,7 @@ module.exports = {
id: 'registration.validationMaxLength' id: 'registration.validationMaxLength'
}) })
}} }}
required={(this.state.countryChoice === 'us')} /> required={(this.state.countryChoice === 'us') ? true : 'isFalse'} />
<GeneralError name="all" /> <GeneralError name="all" />
<NextStepButton waiting={this.props.waiting || this.state.waiting} <NextStepButton waiting={this.props.waiting || this.state.waiting}
text={<intl.FormattedMessage id="registration.nextStep" />} /> text={<intl.FormattedMessage id="registration.nextStep" />} />
......
src/views/credits/credits.jsx
View file @ 4083479c
...@@ -80,11 +80,6 @@ var Credits = React.createClass({ ...@@ -80,11 +80,6 @@ var Credits = React.createClass({
<span className="name">Christan Balch</span> <span className="name">Christan Balch</span>
</li> </li>
<li>
<img src="//cdn.scratch.mit.edu/get_image/user/5721684_170x170.png" alt="Randy Avatar" />
<span className="name">Randy Jou</span>
</li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/10866958_170x170.png" alt="Colby Avatar" /> <img src="//cdn.scratch.mit.edu/get_image/user/10866958_170x170.png" alt="Colby Avatar" />
<span className="name">Colby Gutierrez-Kraybill</span> <span className="name">Colby Gutierrez-Kraybill</span>
...@@ -198,7 +193,7 @@ var Credits = React.createClass({ ...@@ -198,7 +193,7 @@ var Credits = React.createClass({
Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond, Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond,
Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini, Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini,
Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu, Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu,
Tammy Stern, Lis Sylvan, Claudia Urrea, Ben Berg, Hannah Cole, and Andrea Saxman. Tammy Stern, Lis Sylvan, Claudia Urrea, Ben Berg, Hannah Cole, Andrea Saxman, and Randy Jou.
</p> </p>
<h2>Design and Development Partners</h2> <h2>Design and Development Partners</h2>
......
src/views/hoc/hoc.jsx
View file @ 4083479c
...@@ -56,7 +56,7 @@ var Hoc = React.createClass({ ...@@ -56,7 +56,7 @@ var Hoc = React.createClass({
<a href="/projects/editor/?tip_bar=fly"> <a href="/projects/editor/?tip_bar=fly">
<div className="flex-row-card-info"> <div className="flex-row-card-info">
<img className="flex-row-card-info-img" <img className="flex-row-card-info-img"
src="/images/hoc/make-it-fly-tutorial.png" src="/images/hoc/make-it-fly-tutorial.jpg"
alt="" /> alt="" />
<Button className="flex-row-card-info-button"> <Button className="flex-row-card-info-button">
<FormattedMessage id='hoc.tipsMakeItFlyTitle' /> <FormattedMessage id='hoc.tipsMakeItFlyTitle' />
...@@ -217,7 +217,7 @@ var Hoc = React.createClass({ ...@@ -217,7 +217,7 @@ var Hoc = React.createClass({
</div> </div>
<div className="flex-row-card"> <div className="flex-row-card">
<a href="//projects/editor/?tip_bar=dance"> <a href="/projects/editor/?tip_bar=dance">
<div className="flex-row-card-info"> <div className="flex-row-card-info">
<img className="flex-row-card-info-img" <img className="flex-row-card-info-img"
src="/images/hoc/dance-tutorial.jpg" src="/images/hoc/dance-tutorial.jpg"
...@@ -241,7 +241,7 @@ var Hoc = React.createClass({ ...@@ -241,7 +241,7 @@ var Hoc = React.createClass({
</p> </p>
</div> </div>
<FlexRow> <FlexRow className="mod-studio">
<div className="hoc-section-studio"> <div className="hoc-section-studio">
<img className="hoc-section-studio-img" <img className="hoc-section-studio-img"
src="/svgs/studio.svg" src="/svgs/studio.svg"
...@@ -255,22 +255,6 @@ var Hoc = React.createClass({ ...@@ -255,22 +255,6 @@ var Hoc = React.createClass({
</div> </div>
</div> </div>
<div className="hoc-section-studio">
<img className="hoc-section-studio-img"
src="/svgs/studio.svg"
alt="" />
<div className="hoc-section-studio-info">
<a href="/studios/1672166/">
<h5 className="hoc-section-studio-info-header">
<FormattedMessage id='hoc.studioWeBareBears' />
</h5>
</a>
</div>
</div>
</FlexRow>
<FlexRow>
<div className="hoc-section-studio"> <div className="hoc-section-studio">
<img className="hoc-section-studio-img" <img className="hoc-section-studio-img"
src="/svgs/studio.svg" src="/svgs/studio.svg"
...@@ -289,9 +273,9 @@ var Hoc = React.createClass({ ...@@ -289,9 +273,9 @@ var Hoc = React.createClass({
src="/svgs/studio.svg" src="/svgs/studio.svg"
alt="" /> alt="" />
<div className="hoc-section-studio-info"> <div className="hoc-section-studio-info">
<a href="/studios/1672164/"> <a href="/studios/2050750/">
<h5 className="hoc-section-studio-info-header"> <h5 className="hoc-section-studio-info-header">
<FormattedMessage id='hoc.studioAlice' /> <FormattedMessage id='hoc.tipsMakeItFlyTitle' />
</h5> </h5>
</a> </a>
</div> </div>
......
src/views/hoc/hoc.scss
View file @ 4083479c
...@@ -126,8 +126,11 @@ $base-bg: $ui-white; ...@@ -126,8 +126,11 @@ $base-bg: $ui-white;
line-height: inherit; line-height: inherit;
} }
.flex-row.mod-studio {
justify-content: space-between;
}
.hoc-section-studio { .hoc-section-studio {
width: 50%;
align-items: center; align-items: center;
} }
...@@ -137,7 +140,7 @@ $base-bg: $ui-white; ...@@ -137,7 +140,7 @@ $base-bg: $ui-white;
.hoc-section-studio-info-header { .hoc-section-studio-info-header {
margin: 8px 0; margin: 8px 0;
width: 200px; width: 150px;
color: $ui-blue; color: $ui-blue;
font-weight: 500; font-weight: 500;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment