From 581f071c0e689d32cfedfef84b8ee2dd36b5f41c Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 25 Jan 2016 08:30:10 -0500 Subject: [PATCH 1/4] Add missing alt tags --- src/components/intro/intro.jsx | 20 +++++++---- src/views/about/about.jsx | 10 +++--- src/views/credits/credits.jsx | 62 +++++++++++++++++----------------- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/src/components/intro/intro.jsx b/src/components/intro/intro.jsx index 101501627..551d35c7b 100644 --- a/src/components/intro/intro.jsx +++ b/src/components/intro/intro.jsx @@ -64,10 +64,12 @@ var Intro = React.createClass({ + src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-a.png" + alt="Scratch Cat" /> + src="//cdn.scratch.mit.edu/scratchr2/static/images/cat-b.png" + alt="Scratch Cat" />
{this.props.messages['intro.tryItOut']} @@ -76,10 +78,12 @@ var Intro = React.createClass({ + src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-a.png" + alt="Tera" /> + src="//cdn.scratch.mit.edu/scratchr2/static/images/tera-b.png" + alt="Tera" />
{this.props.messages['intro.seeExamples']} @@ -88,10 +92,12 @@ var Intro = React.createClass({ + src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-a.png" + alt="Gobo" /> + src="//cdn.scratch.mit.edu/scratchr2/static/images/gobo-b.png" + alt="Gobo" />
{this.props.messages['intro.joinScratch']} @@ -122,7 +128,7 @@ var Intro = React.createClass({
- + Intro Video
  • - +

  • @@ -56,25 +56,25 @@ var About = React.createClass({
  • - +

  • - +

  • - + Quotes about Scratch

  • - +

  • diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 88fe2fb4f..4b4b5bacd 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -14,112 +14,112 @@ var Credits = React.createClass({
    • - + Mitchel Avatar Mitchel Resnick
    • - + Natalie Avatar Natalie Rusk
    • - + Sayamindu Avatar Sayamindu Dasgupta
    • - + Ricarose Avatar Ricarose Roque
    • - + Ray Avatar Ray Schamp
    • - + Eric Avatar Eric Schilling
    • - + Chris Avatar Chris Willis-Ford
    • - + Carl Avatar Carl Bowman
    • - + Matthew Avatar Matthew Taylor
    • - + Kasia Avatar Kasia Chmielinski
    • - + Tim Avatar Tim Mickel
    • - + Saskia Avatar Saskia Leggett
    • - + Christan Avatar Christan Balch
    • - + Randy Avatar Randy Jou
    • - + Colby Avatar Colby Gutierrez-Kraybill
    • - + Andrew Avatar Andrew Sliwinski
    • - + Ben Avatar Ben Berg
    • - + Carmelo Avatar Carmelo Presicce
    • - + Moran Avatar Moran Tsur
    • - + Juanita Avatar Juanita Buitrago
    • - + Shruti Avatar Shruti Mohnot
    • - + Hannah Avatar Hannah Cole
    @@ -128,47 +128,47 @@ var Credits = React.createClass({
    • - + Mark Avatar Mark Goff
    • - + Franchette Avatar Franchette Viloria
    • - + Sarah Avatar Sarah Otts
    • - + Jolie Avatar Jolie Castellucci
    • - + Andrea Avatar Andrea Saxman
    • - + Dalton Avatar Dalton Miner
    • - + Megan Avatar Megan Haddadi
    • - + Christina Avatar Christina Huang
    • - + Annie Avatar Annie Whitehouse
    From c46e42e83ce9d15fcfaf7aa4ac0a39dbcd3a9960 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 25 Jan 2016 09:07:55 -0500 Subject: [PATCH 2/4] fix test --- src/components/intro/intro.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/intro/intro.jsx b/src/components/intro/intro.jsx index 551d35c7b..c7434278c 100644 --- a/src/components/intro/intro.jsx +++ b/src/components/intro/intro.jsx @@ -128,7 +128,8 @@ var Intro = React.createClass({
    - Intro Video + Intro Video
    Date: Fri, 29 Jan 2016 15:16:32 -0500 Subject: [PATCH 3/4] Fix tall carousel I am mystified by how this changed. But this fixes #345. --- src/components/carousel/carousel.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/carousel/carousel.scss b/src/components/carousel/carousel.scss index 2ab231916..35e0edf2d 100644 --- a/src/components/carousel/carousel.scss +++ b/src/components/carousel/carousel.scss @@ -5,6 +5,7 @@ $button-offset: $icon-size + 5px; $box-content-offset: 20px; + margin-bottom: 0; padding: 12px $button-offset; .box-content & { From fd584b1d6791f5eddebab7cdbfb5692212e9d61e Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Fri, 29 Jan 2016 15:17:51 -0500 Subject: [PATCH 4/4] Heed some SCSS warnings --- src/components/carousel/carousel.scss | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/components/carousel/carousel.scss b/src/components/carousel/carousel.scss index 35e0edf2d..dd2bac747 100644 --- a/src/components/carousel/carousel.scss +++ b/src/components/carousel/carousel.scss @@ -29,8 +29,10 @@ content: ""; } - &.slick-disabled:before { - opacity: 1; + &.slick-disabled { + &:before { + opacity: 1; + } } } @@ -39,11 +41,11 @@ &:before { background-image: url("/svgs/carousel/prev_ui-dark-gray.svg"); - } - &:hover:before { - background-image: url("/svgs/carousel/prev_ui-blue.svg"); - background-size: 90%; + &:hover { + background-image: url("/svgs/carousel/prev_ui-blue.svg"); + background-size: 90%; + } } @@ -57,11 +59,11 @@ &:before { background-image: url("/svgs/carousel/next_ui-dark-gray.svg"); - } - &:hover:before { - background-image: url("/svgs/carousel/next_ui-blue.svg"); - background-size: 90%; + &:hover { + background-image: url("/svgs/carousel/next_ui-blue.svg"); + background-size: 90%; + } } .box-content & {