diff --git a/src/components/modal/ttt/modal.jsx b/src/components/modal/ttt/modal.jsx
index 105e1862e..f3bd48068 100644
--- a/src/components/modal/ttt/modal.jsx
+++ b/src/components/modal/ttt/modal.jsx
@@ -88,7 +88,7 @@ var TTTModal = React.createClass({
href={this.props.activityLoc}
className="button white mod-ttt-item"
>
-
+
@@ -109,7 +109,7 @@ var TTTModal = React.createClass({
href={this.props.guideLoc}
className="button white mod-ttt-item"
>
-
+
diff --git a/src/components/title-banner/title-banner.scss b/src/components/title-banner/title-banner.scss
index 908d58195..21c9ff8d4 100644
--- a/src/components/title-banner/title-banner.scss
+++ b/src/components/title-banner/title-banner.scss
@@ -10,15 +10,20 @@
padding: 20px 0;
width: 100%;
- h1,
+ h1,
p {
margin: 0 auto;
padding: 5px 0;
text-align: center;
- color: $type-white;
+ color: $type-white;
}
p {
max-width: 500px;
}
+
+ // On windows strong gets reset to font-weight 500, so make sure to override for banners
+ strong {
+ font-weight: 700;
+ }
}
diff --git a/src/routes.json b/src/routes.json
index ea6b0fb72..6186498fe 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -121,10 +121,9 @@
},
{
"name": "hoc",
- "pattern": "^/hoc/?$",
+ "pattern": "^/hoc/?(\\?.*)?$",
"routeAlias": "/hoc/?\\??",
- "view": "hoc/hoc",
- "title": "Hour of Code"
+ "redirect": "/go"
},
{
"name": "cards",
diff --git a/src/views/hoc/hoc.jsx b/src/views/hoc/hoc.jsx
deleted file mode 100644
index 1d3a72df9..000000000
--- a/src/views/hoc/hoc.jsx
+++ /dev/null
@@ -1,338 +0,0 @@
-var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
-var FormattedMessage = require('react-intl').FormattedMessage;
-var React = require('react');
-var render = require('../../lib/render.jsx');
-
-var Button = require('../../components/forms/button.jsx');
-var Box = require('../../components/box/box.jsx');
-var FlexRow = require('../../components/flex-row/flex-row.jsx');
-var Page = require('../../components/page/www/page.jsx');
-var SubNavigation = require('../../components/subnavigation/subnavigation.jsx');
-var TitleBanner = require('../../components/title-banner/title-banner.jsx');
-
-require('./hoc.scss');
-
-var Hoc = React.createClass({
- type: 'Hoc',
-
- getInitialState: function () {
- return {
- bgClass: ''
- };
- },
- onCardEnter: function (bgClass) {
- this.setState({
- bgClass: bgClass
- });
- },
- render: function () {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![](/svgs/tips-card.svg)
-
-
-
-
![](/svgs/tips-card.svg)
-
-
-
-
![](/svgs/tips-card.svg)
-
-
-
-
-
-
-
-
![Tips Window Animation](/images/hoc/tips-test-animation.gif)
-
-
-
-
-
-
-
-
-
-
-
![](/svgs/studio.svg)
-
-
-
-
-
![](/svgs/studio.svg)
-
-
-
-
-
![](/svgs/studio.svg)
-
-
-
-
-
-
-
-
-
- );
- }
-});
-
-render(, document.getElementById('app'));
diff --git a/src/views/hoc/hoc.scss b/src/views/hoc/hoc.scss
deleted file mode 100644
index 43b9b4f22..000000000
--- a/src/views/hoc/hoc.scss
+++ /dev/null
@@ -1,216 +0,0 @@
-@import "../../colors";
-@import "../../frameless";
-
-$base-bg: $ui-white;
-
-#view {
- padding: 0;
-}
-
-.hoc-section {
- display: flex;
- margin: 0 auto;
- border-bottom: 1px solid $ui-border;
- padding: 50px 0;
- width: 95%;
- text-align: center;
-
- justify-content: center;
- flex-wrap: wrap;
- align-items: center;
-}
-
-.hoc-section:last-child {
- border-bottom: 0;
-}
-
-.hoc-section.mod-title-banner {
- border: 0;
- padding: 10px 0;
- max-width: $desktop;
-}
-
-.hoc-section-column {
- width: 100%;
-}
-
-.hoc-section-column.mod-split {
- min-width: 200px;
- max-width: 40%;
- text-align: left;
-}
-
-.hoc-section-column-img {
- border-radius: 5px;
- width: 100%;
-}
-
-.hoc-section-paragraph {
- margin: 10px auto 20px;
- max-width: 600px;
-}
-
-.title-banner.mod-wbb-bg {
- background-image: url("/images/hoc2015/hide-bg.jpg");
-}
-
-.title-banner.mod-dance-bg {
- background-image: url("/images/hoc2015/dance-bg.jpg");
-}
-
-.title-banner.mod-name-bg {
- background-image: url("/images/hoc2015/name-bg.jpg");
-}
-
-.flex-row-card {
- margin: 10px;
- border-radius: 7px;
- background-color: $active-gray;
- padding: 2px;
-
- width: 30%;
- min-width: 200px;
- max-width: 230px;
-}
-
-.flex-row-card-info {
- border-radius: 5px;
- background-color: $base-bg;
- width: 100%;
- height: 100%;
-}
-
-.flex-row-card-info-img,
-.button.flex-row-card-info-button {
- width: calc(100% - 20px);
-}
-
-.flex-row-card-info-img {
- margin: 10px 10px 5px 10px;
- border-radius: 5px;
-}
-
-.button.flex-row-card-info-button {
- margin: 0 10px 10px 10px;
-}
-
-.hoc-section-resource,
-.hoc-section-studio {
- display: flex;
- margin: 10px 0;
- min-width: 200px;
-
- text-align: left;
- justify-content: center;
-}
-
-.hoc-section-resource-img,
-.hoc-section-studio-img {
- margin-right: 15px;
-}
-
-.hoc-section-resource {
- width: 33%;
- min-height: 4rem;
- align-items: flex-start;
-}
-
-.hoc-section-resource-anchor {
- display: block;
- margin: 5px 0;
- font-size: .8em;
-}
-
-.hoc-section-resource-info-header {
- margin: 0;
- line-height: inherit;
-}
-
-.flex-row.mod-studio {
- justify-content: space-between;
-}
-
-.hoc-section-studio {
- align-items: center;
-}
-
-.hoc-section-studio-img {
- float: left;
-}
-
-.hoc-section-studio-info-header {
- margin: 8px 0;
- width: 150px;
- color: $ui-blue;
- font-weight: 500;
-}
-
-.hoc-section-studio-info-header:hover {
- color: darken($ui-blue, 15);
-}
-
-.hoc-section-logos {
- margin: 20px 0;
- width: 100%;
-}
-
-.hoc-section-logos-img {
- margin: 20px;
- max-width: 150px;
- max-height: 55px;
- vertical-align: middle;
-}
-
-.hoc-section-trademark {
- margin-top: 20px;
-}
-
-@media only screen and (max-width: $mobile - 1) {
- .hoc-section-studio {
- display: inline-block;
- }
-}
-
-//6 columns
-@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
- .hoc-section.mod-title-banner {
- max-width: $mobile;
- }
-
- .hoc-section-studio {
- display: inline-block;
- }
-}
-
-//8 columns
-@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
- .flex-row-card {
- margin: 2px;
- min-width: 175px;
- }
-
- .button.flex-row-card-info-button {
- font-size: .7em;
- }
-
- .hoc-section-resource,
- .hoc-section-studio {
- display: block;
- width: 30%;
- min-width: 180px;
- text-align: center;
- }
-
- .hoc-section-resource-img,
- .hoc-section-studio-img {
- margin: 0 auto;
- }
-
- .hoc-section-studio-img {
- float: none;
- }
-
- .hoc-section-studio-info-header {
- width: 100%;
- }
-}
diff --git a/src/views/hoc/l10n.json b/src/views/hoc/l10n.json
deleted file mode 100644
index 08d2c3965..000000000
--- a/src/views/hoc/l10n.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "hoc.activityCards": "Activity Cards",
- "hoc.activityCardsHeader": "Activity Cards and Guides",
- "hoc.activityCardsInfo1": "Want tips and ideas for these Hour of Code™ activities? Use the activity cards to get ideas for creating with Scratch. Facilitator guides can help you plan a group activity.",
- "hoc.addToStudios": "Add Your Projects to Studios",
- "hoc.addToStudiosDescription": "These studios include projects created by young people around the world. Take a look at the studios to get inspired - or submit your own projects to the studios!",
- "hoc.facilitatorGuide": "Facilitator Guide",
- "hoc.findOutMore": "Find out more",
- "hoc.helpScratch": "Help with Scratch",
- "hoc.helpScratchDescription": "You can find tutorials and helpful hints in the Tips Window. For more resources, see Scratch Help",
- "hoc.moreActivities": "Want More Activities?",
- "hoc.moreDescription": "Check out these other tutorials. Or remix one of our Starter Projects",
- "hoc.officialNotice": "The \"Hour of Code™\" is a nationwide initiative by Computer Science Education Week and Code.org to introduce millions of students to one hour of computer science and computer programming.",
- "hoc.studioAlice": "Alice in Wonderland Studio",
- "hoc.studioWeBareBears": "We Bare Bears Studio",
- "hoc.subTitle": "With Scratch, you can program your own stories, games, and animations — and share them online.",
- "hoc.tipsDescription": "Need help getting started? Looking for ideas? You can find tutorials and helpful hints in the Tips Window",
- "hoc.title": "Get Creative with Coding",
- "hoc.tipsAnimateYourNameTitle": "Animate Your Name",
- "hoc.tipsDanceTitle": "Dance, Dance, Dance",
- "hoc.tipsGetStarted": "Getting Started",
- "hoc.tipsHideAndSeekTitle": "Hide-and-Seek Game",
- "hoc.tipsMakeMusicTitle": "Make Music",
- "hoc.tipsMakeItFlyTitle": "Make it Fly",
- "hoc.tipsPongGame": "Create a Pong Game"
-}
\ No newline at end of file
diff --git a/src/views/jobs/jobs.jsx b/src/views/jobs/jobs.jsx
index fd446ec14..92c040dde 100644
--- a/src/views/jobs/jobs.jsx
+++ b/src/views/jobs/jobs.jsx
@@ -31,7 +31,7 @@ var Jobs = React.createClass({
-
-
+
Trust & Safety Manager
diff --git a/src/views/thingstotry/l10n.json b/src/views/thingstotry/l10n.json
index 93271362e..a1fdeeb2c 100644
--- a/src/views/thingstotry/l10n.json
+++ b/src/views/thingstotry/l10n.json
@@ -1,7 +1,7 @@
{
"ttt.placeholder": "Placeholder text",
"ttt.title": "Things to Try",
- "ttt.subTitle": "You can get started with Scratch in a variety of ways. Click a picture to try a Tutorial. You can also download a set of Activity Cards and Educator Guide for each theme.",
+ "ttt.subTitle": "You can get started with Scratch in a variety of ways. Click a picture to try the Tutorial. You can also download a set of Activity Cards and Educator Guide for each theme.",
"tile.tutorial": "Tutorial",
"tile.guides": "See Cards and Guides",
"ttt.tutorialTitle": "Tutorial",
@@ -11,7 +11,7 @@
"ttt.educatorTitle": "Educator Guide",
"ttt.educatorSubtitle": "Use this educator guide to plan and lead a one-hour Scratch workshop.",
"ttt.tryIt": "Try It",
- "ttt.download": "Download",
+ "ttt.open": "Open",
"ttt.MakeItFlyTitle": "Make It Fly",
"ttt.MakeItFlyDescription": "Animate the Scratch Cat, The Powerpuff Girls, or even a taco!",
"ttt.AnimateYourNameTitle": "Animate Your Name",
@@ -20,7 +20,7 @@
"ttt.RaceDescription": "Make a game where two characters race each other.",
"ttt.MakeMusicTitle": "Make Music",
"ttt.MakeMusicDescription": "Choose instruments, add sounds, and press keys to play music.",
- "ttt.HideAndSeekTitle": "Hide-and-Seek Game",
+ "ttt.HideAndSeekTitle": "Hide and Seek",
"ttt.HideAndSeekDescription": "Make a hide-and-seek game with characters that appear and disappear.",
"ttt.StoryTitle": "Create a Story",
"ttt.StoryDescription": "Choose characters, add conversation, and bring your story to life.",
diff --git a/static/pdfs/cards/FlyCards.pdf b/static/pdfs/cards/FlyCards.pdf
index 8ecc50a7b..525ecd1ff 100644
Binary files a/static/pdfs/cards/FlyCards.pdf and b/static/pdfs/cards/FlyCards.pdf differ