scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #343 from LLK/release/2.2.5

Browse source 
Release/2.2.5 (develop)
This commit is contained in:
Ray Schamp 2016-01-29 15:48:10 -05:00
commit 755e24f7ad
4 changed files with 63 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/carousel/carousel.scss
View file

@ -5,6 +5,7 @@
$button-offset: $icon-size + 5px; $button-offset: $icon-size + 5px;
$box-content-offset: 20px; $box-content-offset: 20px;
margin-bottom: 0;
padding: 12px $button-offset; padding: 12px $button-offset;
.box-content & { .box-content & {
@ -28,22 +29,24 @@
content: ""; content: "";
} }
&.slick-disabled:before { &.slick-disabled {
&:before {
opacity: 1; opacity: 1;
} }
} }
}
.slick-prev { .slick-prev {
left: 0; left: 0;
&:before { &:before {
background-image: url("/svgs/carousel/prev_ui-dark-gray.svg"); background-image: url("/svgs/carousel/prev_ui-dark-gray.svg");
}
&:hover:before { &:hover {
background-image: url("/svgs/carousel/prev_ui-blue.svg"); background-image: url("/svgs/carousel/prev_ui-blue.svg");
background-size: 90%; background-size: 90%;
} }
}
.box-content & { .box-content & {
@ -56,12 +59,12 @@
&:before { &:before {
background-image: url("/svgs/carousel/next_ui-dark-gray.svg"); background-image: url("/svgs/carousel/next_ui-dark-gray.svg");
}
&:hover:before { &:hover {
background-image: url("/svgs/carousel/next_ui-blue.svg"); background-image: url("/svgs/carousel/next_ui-blue.svg");
background-size: 90%; background-size: 90%;
} }
}
.box-content & { .box-content & {
right: -$box-content-offset; right: -$box-content-offset;

21
src/components/intro/intro.jsx
View file

@ -64,10 +64,12 @@ var Intro = React.createClass({
<a className="sprite sprite-1" href="/projects/editor/?tip_bar=getStarted"> <a className="sprite sprite-1" href="/projects/editor/?tip_bar=getStarted">
<img <img
className="costume costume-1" className="costume costume-1"
src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-a.png" /> src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-a.png"
alt="Scratch Cat" />
<img <img
className="costume costume-2" className="costume costume-2"
src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-b.png" /> src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-b.png"
alt="Scratch Cat" />
<div className="circle"></div> <div className="circle"></div>
<div className="text"> <div className="text">
{this.props.messages['intro.tryItOut']} {this.props.messages['intro.tryItOut']}
@ -76,10 +78,12 @@ var Intro = React.createClass({
<a className="sprite sprite-2" href="/starter_projects/"> <a className="sprite sprite-2" href="/starter_projects/">
<img <img
className="costume costume-1" className="costume costume-1"
src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-a.png" /> src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-a.png"
alt="Tera" />
<img <img
className="costume costume-2" className="costume costume-2"
src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-b.png" /> src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-b.png"
alt="Tera" />
<div className="circle"></div> <div className="circle"></div>
<div className="text"> <div className="text">
{this.props.messages['intro.seeExamples']} {this.props.messages['intro.seeExamples']}
@ -88,10 +92,12 @@ var Intro = React.createClass({
<a className="sprite sprite-3" href="#" onClick={this.handleJoinClick}> <a className="sprite sprite-3" href="#" onClick={this.handleJoinClick}>
<img <img
className="costume costume-1" className="costume costume-1"
src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-a.png" /> src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-a.png"
alt="Gobo" />
<img <img
className="costume costume-2" className="costume costume-2"
src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-b.png" /> src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-b.png"
alt="Gobo" />
<div className="circle"></div> <div className="circle"></div>
<div className="text"> <div className="text">
{this.props.messages['intro.joinScratch']} {this.props.messages['intro.joinScratch']}
@ -122,7 +128,8 @@ var Intro = React.createClass({
</div> </div>
<div className="video"> <div className="video">
<div className="play-button" onClick={this.showVideo}></div> <div className="play-button" onClick={this.showVideo}></div>
<img src="//cdn.scratch.mit.edu/scratchr2/static/images/hp-video-screenshot.png" /> <img src="//cdn.scratch.mit.edu/scratchr2/static/images/hp-video-screenshot.png"
alt="Intro Video" />
</div> </div>
<Modal <Modal
className="video-modal" className="video-modal"

10
src/views/about/about.jsx
View file

@ -39,7 +39,7 @@ var About = React.createClass({
<ul> <ul>
<li> <li>
<h2><FormattedMessage id='about.whoUsesScratch' /></h2> <h2><FormattedMessage id='about.whoUsesScratch' /></h2>
<img src="/images/about/who-uses-scratch.jpg" /> <img src="/images/about/who-uses-scratch.jpg" alt="" />
<p><FormattedHTMLMessage id='about.whoUsesScratchDescription' /></p> <p><FormattedHTMLMessage id='about.whoUsesScratchDescription' /></p>
</li> </li>
@ -56,25 +56,25 @@ var About = React.createClass({
<li> <li>
<h2><FormattedMessage id='about.aroundTheWorld' /></h2> <h2><FormattedMessage id='about.aroundTheWorld' /></h2>
<img src="/images/about/around-the-world.png" /> <img src="/images/about/around-the-world.png" alt="" />
<p><FormattedHTMLMessage id='about.aroundTheWorldDescription' /></p> <p><FormattedHTMLMessage id='about.aroundTheWorldDescription' /></p>
</li> </li>
<li> <li>
<h2><FormattedMessage id='about.schools' /></h2> <h2><FormattedMessage id='about.schools' /></h2>
<img src="/images/about/scratch-in-schools.jpg" /> <img src="/images/about/scratch-in-schools.jpg" alt="" />
<p><FormattedHTMLMessage id='about.schoolsDescription' /></p> <p><FormattedHTMLMessage id='about.schoolsDescription' /></p>
</li> </li>
<li> <li>
<h2><FormattedMessage id='about.quotes' /></h2> <h2><FormattedMessage id='about.quotes' /></h2>
<img src="/images/about/quotes.gif" /> <img src="/images/about/quotes.gif" alt="Quotes about Scratch" />
<p><FormattedHTMLMessage id='about.quotesDescription' /></p> <p><FormattedHTMLMessage id='about.quotesDescription' /></p>
</li> </li>
<li> <li>
<h2><FormattedMessage id='about.research' /></h2> <h2><FormattedMessage id='about.research' /></h2>
<img src="/images/about/research-remix.png" /> <img src="/images/about/research-remix.png" alt="" />
<p><FormattedHTMLMessage id='about.researchDescription' /></p> <p><FormattedHTMLMessage id='about.researchDescription' /></p>
</li> </li>

62
src/views/credits/credits.jsx
View file

@ -14,112 +14,112 @@ var Credits = React.createClass({
<ul> <ul>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/167_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/167_170x170.png" alt="Mitchel Avatar" />
<span className="name">Mitchel Resnick</span> <span className="name">Mitchel Resnick</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/169_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/169_170x170.png" alt="Natalie Avatar" />
<span className="name">Natalie Rusk</span> <span className="name">Natalie Rusk</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/573207_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/573207_170x170.png" alt="Sayamindu Avatar" />
<span className="name">Sayamindu Dasgupta</span> <span className="name">Sayamindu Dasgupta</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/13682_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/13682_170x170.png" alt="Ricarose Avatar" />
<span className="name">Ricarose Roque</span> <span className="name">Ricarose Roque</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/2584924_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/2584924_170x170.png" alt="Ray Avatar" />
<span className="name">Ray Schamp</span> <span className="name">Ray Schamp</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/3484484_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/3484484_170x170.png" alt="Eric Avatar" />
<span className="name">Eric Schilling</span> <span className="name">Eric Schilling</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/3532363_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/3532363_170x170.png" alt="Chris Avatar" />
<span className="name">Chris Willis-Ford</span> <span className="name">Chris Willis-Ford</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/3581881_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/3581881_170x170.png" alt="Carl Avatar" />
<span className="name">Carl Bowman</span> <span className="name">Carl Bowman</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/4373707_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/4373707_170x170.png" alt="Matthew Avatar" />
<span className="name">Matthew Taylor</span> <span className="name">Matthew Taylor</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/4598206_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/4598206_170x170.png" alt="Kasia Avatar" />
<span className="name">Kasia Chmielinski</span> <span className="name">Kasia Chmielinski</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/703844_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/703844_170x170.png" alt="Tim Avatar" />
<span className="name">Tim Mickel</span> <span className="name">Tim Mickel</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/2752403_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/2752403_170x170.png" alt="Saskia Avatar" />
<span className="name">Saskia Leggett</span> <span className="name">Saskia Leggett</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/2755634_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/2755634_170x170.png" alt="Christan Avatar" />
<span className="name">Christan Balch</span> <span className="name">Christan Balch</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/5721684_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/5721684_170x170.png" alt="Randy Avatar" />
<span className="name">Randy Jou</span> <span className="name">Randy Jou</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/10866958_170x170.png" /> <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>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/1709047_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/1709047_170x170.png" alt="Andrew Avatar" />
<span className="name">Andrew Sliwinski</span> <span className="name">Andrew Sliwinski</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" alt="Ben Avatar" />
<span className="name">Ben Berg</span> <span className="name">Ben Berg</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/2286560_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/2286560_170x170.png" alt="Carmelo Avatar" />
<span className="name">Carmelo Presicce</span> <span className="name">Carmelo Presicce</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" alt="Moran Avatar" />
<span className="name">Moran Tsur</span> <span className="name">Moran Tsur</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/3661900_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/3661900_170x170.png" alt="Juanita Avatar" />
<span className="name">Juanita Buitrago</span> <span className="name">Juanita Buitrago</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/default_170x170.png" alt="Shruti Avatar" />
<span className="name">Shruti Mohnot</span> <span className="name">Shruti Mohnot</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/1915915_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/1915915_170x170.png" alt="Hannah Avatar" />
<span className="name">Hannah Cole</span> <span className="name">Hannah Cole</span>
</li> </li>
</ul> </ul>
@ -128,47 +128,47 @@ var Credits = React.createClass({
<ul> <ul>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/49156_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/49156_170x170.png" alt="Mark Avatar" />
<span className="name">Mark Goff</span> <span className="name">Mark Goff</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/159139_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/159139_170x170.png" alt="Franchette Avatar" />
<span className="name">Franchette Viloria</span> <span className="name">Franchette Viloria</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/246290_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/246290_170x170.png" alt="Sarah Avatar" />
<span className="name">Sarah Otts</span> <span className="name">Sarah Otts</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/2496866_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/2496866_170x170.png" alt="Jolie Avatar" />
<span className="name">Jolie Castellucci</span> <span className="name">Jolie Castellucci</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/3087865_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/3087865_170x170.png" alt="Andrea Avatar" />
<span className="name">Andrea Saxman</span> <span className="name">Andrea Saxman</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/373646_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/373646_170x170.png" alt="Dalton Avatar" />
<span className="name">Dalton Miner</span> <span className="name">Dalton Miner</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/586054_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/586054_170x170.png" alt="Megan Avatar" />
<span className="name">Megan Haddadi</span> <span className="name">Megan Haddadi</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/4836354_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/4836354_170x170.png" alt="Christina Avatar" />
<span className="name">Christina Huang</span> <span className="name">Christina Huang</span>
</li> </li>
<li> <li>
<img src="//cdn.scratch.mit.edu/get_image/user/4747093_170x170.png" /> <img src="//cdn.scratch.mit.edu/get_image/user/4747093_170x170.png" alt="Annie Avatar" />
<span className="name">Annie Whitehouse</span> <span className="name">Annie Whitehouse</span>
</li> </li>
</ul> </ul>