From dbb4fcc8a2782cf84b304c19b27b4b6cf35ca198 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 23 Jun 2017 09:23:24 -0400 Subject: [PATCH 01/13] tweak some styling for the download page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds the numbers back in above the download steps, and also moves the “note for mac users” down into a callout. --- src/views/download/download.jsx | 163 +++++++++++++++++-------------- src/views/download/download.scss | 25 +++++ 2 files changed, 112 insertions(+), 76 deletions(-) diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx index b5d979b0b..8eca5196b 100644 --- a/src/views/download/download.jsx +++ b/src/views/download/download.jsx @@ -58,28 +58,25 @@ var Download = React.createClass({

-

- -

- +
    • - +
    • - +
    • - +
    • @@ -89,97 +86,111 @@ var Download = React.createClass({
    - -
    -

    -

    -     -
    -
    -

    -

    - {downloadUrls ? [ +
    +

    + +

    + +
    +
    +

    {'1'}

    +
    +

    +

    - ] : []} - {this.state.swfVersion === -1 ? [ -

    - ] : []} -
    -
    -

    -

    - -
    -     +
    +
    +
    +

    {'2'}

    +
    +

    +

    + {downloadUrls ? [ + + ] : []} + {this.state.swfVersion === -1 ? [ +

    + ] : []} +
    +
    +
    +

    {'3'}

    +
    +

    +

    + +
    + +
    diff --git a/src/views/download/download.scss b/src/views/download/download.scss index 7f4d4d7c4..7a82a04ae 100644 --- a/src/views/download/download.scss +++ b/src/views/download/download.scss @@ -50,6 +50,10 @@ $developer-spot: $splash-blue; } } + .sub-nav-item { + margin: .5rem; + } + .download-content { padding-bottom: 2rem; } @@ -65,6 +69,23 @@ $developer-spot: $splash-blue; .installation-column { max-width: $cols4; + text-align: center; + } + + .installation-column-number { + margin: 2rem auto; + border: 2px solid $active-gray; + border-radius: 2rem; + box-shadow: 0 0 0 .5rem lighten($ui-blue, 35); + background-color: $ui-blue; + width: 3.75rem; + height: 3.75rem; + } + + .installation-column-number-text { + text-align: center; + line-height: 1.8em; + color: $type-white; } .installation-downloads { @@ -75,6 +96,7 @@ $developer-spot: $splash-blue; .installation-downloads-item { margin: .25rem; padding: 0; + text-align: center; } section { @@ -91,8 +113,11 @@ $developer-spot: $splash-blue; max-width: 100%; } } + } + @media only screen and (max-width: $desktop - 1) { .three-col-row { + flex-direction: column; align-items: center; } } From 39b1400705fc3884655138da3f10c22ca6ff5bd8 Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Fri, 23 Jun 2017 10:28:34 -0400 Subject: [PATCH 02/13] Handle /help redirect (#1363) --- bin/lib/localized-urls.json | 154 ++++++++++++++++++------------------ src/routes.json | 6 ++ 2 files changed, 83 insertions(+), 77 deletions(-) diff --git a/bin/lib/localized-urls.json b/bin/lib/localized-urls.json index 08cdfe1d4..ddccf3e18 100644 --- a/bin/lib/localized-urls.json +++ b/bin/lib/localized-urls.json @@ -1,113 +1,113 @@ { "ar": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/ar/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ar/Scratch2Cards.pdf" }, "ca": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/Scratch2Cards.pdf", - "cards.ScratchCardsAllLink": "https:/resources.scratch.mit.edu/www/cards/ca/ScratchCardsAll.pdf", - "cards.catchCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/catchCards.pdf", - "cards.danceCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/danceCards.pdf", - "cards.fashionCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/fashionCards.pdf", - "cards.flyCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/flyCards.pdf", - "cards.hide-seekCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/hide-seekCards.pdf", - "cards.musicCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/musicCards.pdf", - "cards.nameCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/nameCards.pdf", - "cards.petCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/petCards.pdf", - "cards.pongCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/pongCards.pdf", - "cards.raceCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/raceCards.pdf", - "cards.storyCardsLink": "https:/resources.scratch.mit.edu/www/cards/ca/storyCards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ca/Scratch2Cards.pdf", + "cards.ScratchCardsAllLink": "https://resources.scratch.mit.edu/www/cards/ca/ScratchCardsAll.pdf", + "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/catchCards.pdf", + "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/danceCards.pdf", + "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/fashionCards.pdf", + "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/flyCards.pdf", + "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/hide-seekCards.pdf", + "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/musicCards.pdf", + "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/nameCards.pdf", + "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/petCards.pdf", + "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/pongCards.pdf", + "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/raceCards.pdf", + "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/storyCards.pdf" }, "cs": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/cs/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/cs/Scratch2Cards.pdf" }, "de": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/de/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/de/Scratch2Cards.pdf" }, "en": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/en/Scratch2Cards.pdf", - "cards.ScratchCardsAllLink": "https:/resources.scratch.mit.edu/www/cards/en/ScratchCardsAll.pdf", - "cards.catchCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/catchCards.pdf", - "cards.danceCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/danceCards.pdf", - "cards.dressupCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/dressupCards.pdf", - "cards.fashionCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/fashionCards.pdf", - "cards.flyCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/flyCards.pdf", - "cards.hide-seekCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/hide-seekCards.pdf", - "cards.musicCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/musicCards.pdf", - "cards.nameCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/nameCards.pdf", - "cards.petCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/petCards.pdf", - "cards.pongCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/pongCards.pdf", - "cards.raceCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/raceCards.pdf", - "cards.storyCardsLink": "https:/resources.scratch.mit.edu/www/cards/en/storyCards.pdf", - "guides.AnimateYourNameGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/AnimateYourNameGuide.pdf", - "guides.CatchGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/CatchGuide.pdf", - "guides.DanceGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/DanceGuide.pdf", - "guides.FashionGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/FashionGuide.pdf", - "guides.FlyGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/FlyGuide.pdf", - "guides.Getting-Started-Guide-Scratch2Link": "https:/resources.scratch.mit.edu/www/guides/en/Getting-Started-Guide-Scratch2.pdf", - "guides.HideandSeekGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/HideandSeekGuide.pdf", - "guides.MusicGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/MusicGuide.pdf", - "guides.NameGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/NameGuide.pdf", - "guides.PetGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/PetGuide.pdf", - "guides.PongGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/PongGuide.pdf", - "guides.RaceGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/RaceGuide.pdf", - "guides.StoryGuideLink": "https:/resources.scratch.mit.edu/www/guides/en/StoryGuide.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/en/Scratch2Cards.pdf", + "cards.ScratchCardsAllLink": "https://resources.scratch.mit.edu/www/cards/en/ScratchCardsAll.pdf", + "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/en/catchCards.pdf", + "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/en/danceCards.pdf", + "cards.dressupCardsLink": "https://resources.scratch.mit.edu/www/cards/en/dressupCards.pdf", + "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/en/fashionCards.pdf", + "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/en/flyCards.pdf", + "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/en/hide-seekCards.pdf", + "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/en/musicCards.pdf", + "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/en/nameCards.pdf", + "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/en/petCards.pdf", + "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/en/pongCards.pdf", + "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/en/raceCards.pdf", + "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/en/storyCards.pdf", + "guides.AnimateYourNameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/AnimateYourNameGuide.pdf", + "guides.CatchGuideLink": "https://resources.scratch.mit.edu/www/guides/en/CatchGuide.pdf", + "guides.DanceGuideLink": "https://resources.scratch.mit.edu/www/guides/en/DanceGuide.pdf", + "guides.FashionGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FashionGuide.pdf", + "guides.FlyGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FlyGuide.pdf", + "guides.Getting-Started-Guide-Scratch2Link": "https://resources.scratch.mit.edu/www/guides/en/Getting-Started-Guide-Scratch2.pdf", + "guides.HideandSeekGuideLink": "https://resources.scratch.mit.edu/www/guides/en/HideandSeekGuide.pdf", + "guides.MusicGuideLink": "https://resources.scratch.mit.edu/www/guides/en/MusicGuide.pdf", + "guides.NameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/NameGuide.pdf", + "guides.PetGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PetGuide.pdf", + "guides.PongGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PongGuide.pdf", + "guides.RaceGuideLink": "https://resources.scratch.mit.edu/www/guides/en/RaceGuide.pdf", + "guides.StoryGuideLink": "https://resources.scratch.mit.edu/www/guides/en/StoryGuide.pdf" }, "es": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/es/Scratch2Cards.pdf", - "cards.catchCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/catchCards.pdf", - "cards.danceCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/danceCards.pdf", - "cards.fashionCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/fashionCards.pdf", - "cards.flyCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/flyCards.pdf", - "cards.hide-seekCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/hide-seekCards.pdf", - "cards.musicCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/musicCards.pdf", - "cards.nameCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/nameCards.pdf", - "cards.petCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/petCards.pdf", - "cards.pongCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/pongCards.pdf", - "cards.raceCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/raceCards.pdf", - "cards.storyCardsLink": "https:/resources.scratch.mit.edu/www/cards/es/storyCards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/es/Scratch2Cards.pdf", + "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/es/catchCards.pdf", + "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/es/danceCards.pdf", + "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/es/fashionCards.pdf", + "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/es/flyCards.pdf", + "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/es/hide-seekCards.pdf", + "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/es/musicCards.pdf", + "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/es/nameCards.pdf", + "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/es/petCards.pdf", + "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/es/pongCards.pdf", + "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/es/raceCards.pdf", + "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/es/storyCards.pdf" }, "fr": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/fr/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/fr/Scratch2Cards.pdf" }, "hr": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/hr/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/hr/Scratch2Cards.pdf" }, "it": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/it/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/it/Scratch2Cards.pdf" }, "ja": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/ja/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ja/Scratch2Cards.pdf" }, "ja-hr": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/ja-hr/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ja-hr/Scratch2Cards.pdf" }, "ko": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/ko/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ko/Scratch2Cards.pdf" }, "nl": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/nl/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/nl/Scratch2Cards.pdf" }, "pt-br": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/pt-br/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/pt-br/Scratch2Cards.pdf" }, "sl": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/sl/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/sl/Scratch2Cards.pdf" }, "sv": { - "cards.Scratch2CardsLink": "https:/resources.scratch.mit.edu/www/cards/sv/Scratch2Cards.pdf" + "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/sv/Scratch2Cards.pdf" }, "zh-tw": { - "cards.ScratchCardsAllLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/ScratchCardsAll.pdf", - "cards.catchCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/catchCards.pdf", - "cards.danceCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/danceCards.pdf", - "cards.fashionCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/fashionCards.pdf", - "cards.flyCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/flyCards.pdf", - "cards.hide-seekCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/hide-seekCards.pdf", - "cards.musicCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/musicCards.pdf", - "cards.nameCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/nameCards.pdf", - "cards.petCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/petCards.pdf", - "cards.pongCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/pongCards.pdf", - "cards.raceCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/raceCards.pdf", - "cards.storyCardsLink": "https:/resources.scratch.mit.edu/www/cards/zh-tw/storyCards.pdf" + "cards.ScratchCardsAllLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/ScratchCardsAll.pdf", + "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/catchCards.pdf", + "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/danceCards.pdf", + "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/fashionCards.pdf", + "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/flyCards.pdf", + "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/hide-seekCards.pdf", + "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/musicCards.pdf", + "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/nameCards.pdf", + "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/petCards.pdf", + "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/pongCards.pdf", + "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/raceCards.pdf", + "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/storyCards.pdf" } } \ No newline at end of file diff --git a/src/routes.json b/src/routes.json index b28e5309c..89aab1dfd 100644 --- a/src/routes.json +++ b/src/routes.json @@ -151,6 +151,12 @@ "routeAlias": "/go/?\\??", "redirect": "/tips" }, + { + "name": "help", + "pattern": "^/help/?(\\?.*)?$", + "routeAlias": "/help/?\\??", + "redirect": "/tips" + }, { "name": "tips", "pattern": "^/tips/?(\\?.*)?$", From c1e5c7cb03262664baedb19e6dc3cbde3e03461e Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 23 Jun 2017 11:55:43 -0400 Subject: [PATCH 03/13] Change `help` to `tips` in footer Fixes #1364 --- src/components/footer/www/footer.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx index c8e6015ab..4a99bded2 100644 --- a/src/components/footer/www/footer.jsx +++ b/src/components/footer/www/footer.jsx @@ -127,8 +127,8 @@ var Footer = React.createClass({
    - - + +
    From 6469ac3362f589a902aae01ef0bc720eeb7695fd Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Fri, 23 Jun 2017 12:02:15 -0400 Subject: [PATCH 04/13] Simplify /help redirect pattern (#1366) Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2. --- src/routes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes.json b/src/routes.json index 89aab1dfd..631714bee 100644 --- a/src/routes.json +++ b/src/routes.json @@ -153,8 +153,8 @@ }, { "name": "help", - "pattern": "^/help/?(\\?.*)?$", - "routeAlias": "/help/?\\??", + "pattern": "^/help/?$", + "routeAlias": "/help", "redirect": "/tips" }, { From a16a189a7fca48346af09a09d89a12f574ae3528 Mon Sep 17 00:00:00 2001 From: Andrew Sliwinski Date: Mon, 26 Jun 2017 09:42:56 -0400 Subject: [PATCH 05/13] Update compatibility requirements to clarify support for ChromeOS --- src/views/faq/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/faq/l10n.json b/src/views/faq/l10n.json index 572f3c6d1..746cbd48f 100644 --- a/src/views/faq/l10n.json +++ b/src/views/faq/l10n.json @@ -13,7 +13,7 @@ "faq.makeGameTitle":"How do I make a game or animation with Scratch?", "faq.makeGameBody":"Check out the help page to see lots of ways to get started with Scratch. Or just dive in to the project editor.", "faq.requirementsTitle":"What are the system requirements for Scratch?", - "faq.requirementsBody":"To run Scratch 2, you need to be using (1) a Mac, Linux, or Windows computer; (2) a version of Adobe Flash Player released on or after June 15, 2016; (3) a relatively recent web browser: one of the latest two versions of Chrome (Mac, Windows, or Linux), Firefox (Mac or Windows only), Safari (Mac or Windows only), Edge (Windows only), or Internet Explorer 10+ (Windows only). If your computer doesn’t meet these requirements, you can try downloading and installing Scratch 1.4, which you can still use to share projects to the Scratch 2 website. We do not support Chromium.", + "faq.requirementsBody":"To run Scratch 2, you need to be using (1) a Windows, ChromeOS, Mac, or Linux computer; (2) a version of Adobe Flash Player released on or after June 15, 2016; (3) a relatively recent web browser: one of the latest two versions of Chrome (Windows, ChromeOS, Mac or Linux), Firefox (Windows or Mac only), Safari (Mac only), Edge (Windows only), or Internet Explorer 11 (Windows only). If your computer doesn’t meet these requirements, you can try downloading and installing Scratch 1.4, which you can still use to share projects to the Scratch 2 website.", "faq.offlineTitle":"Do you have a downloadable version so I can create and view projects offline?", "faq.offlineBody":"The Scratch 2 offline editor allows you to create Scratch projects without an internet connection. You can download Scratch 2 from the website. You can also still use Scratch 1.4. Note: You can have both Scratch 1.4 and 2 on your computer.", "faq.uploadOldTitle":"Can I still upload projects created with older versions of Scratch to the website?", From b22aaa84653efc68383a99fb234cc2fa7923b1c1 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 26 Jun 2017 10:35:29 -0400 Subject: [PATCH 06/13] Add `/store` to footer --- src/components/footer/www/footer.jsx | 5 +++++ src/l10n.json | 1 + 2 files changed, 6 insertions(+) diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx index 4a99bded2..0cfaa46cd 100644 --- a/src/components/footer/www/footer.jsx +++ b/src/components/footer/www/footer.jsx @@ -146,6 +146,11 @@ var Footer = React.createClass({
    +
    + + + +
    diff --git a/src/l10n.json b/src/l10n.json index ded67d809..078c4646a 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -62,6 +62,7 @@ "general.scratchEd": "ScratchEd", "general.scratchFoundation": "Scratch Foundation", "general.scratchJr": "ScratchJr", + "general.scratchStore": "Scratch Store", "general.search": "Search", "general.signIn": "Sign in", "general.statistics": "Statistics", From 022d2dd506c75493fa56ec8e0c0ca7ca09e3bc3d Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Tue, 27 Jun 2017 16:27:07 -0400 Subject: [PATCH 07/13] FIx layout problems (#1380) * removed white-space: no wrap to let buttons flow in Cards section * Fix download link (download should be part of the link) * Set the size of the icons to fix alignment --- src/views/tips/l10n.json | 2 +- src/views/tips/tips.jsx | 12 +++++++++--- src/views/tips/tips.scss | 13 +++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/views/tips/l10n.json b/src/views/tips/l10n.json index e2df90d9f..dcbeb28ce 100644 --- a/src/views/tips/l10n.json +++ b/src/views/tips/l10n.json @@ -12,7 +12,7 @@ "tips.starterProjectsBody": "You can play with Starter Projects to get ideas for making your own projects.", "tips.starterProjectsPlay": "Play with Starter Projects", "tips.offlineEditorHeader": "Offline Editor", - "tips.offlineEditorBody": "To create projects without an Internet connection, you can download the offline editor.", + "tips.offlineEditorBody": "To create projects without an Internet connection, you can download the offline editor.", "tips.questionsHeader": "Questions", "tips.questionsBody": "Have more questions? See the Frequently Asked Questions or visit the Help with Scripts Forum.", "ttt.tutorial": "Tutorial", diff --git a/src/views/tips/tips.jsx b/src/views/tips/tips.jsx index 922958c3a..da9295b50 100644 --- a/src/views/tips/tips.jsx +++ b/src/views/tips/tips.jsx @@ -102,7 +102,7 @@ var Tips = injectIntl(React.createClass({

    -

    +