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 #276 from thisandagain/hotfix/hoc

Browse source 
Hotfix - Legal fixes for HOC page
This commit is contained in:
Ray Schamp 2015-12-04 13:01:21 -05:00
commit b85775b20f
4 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
en.json
View file

@ -51,7 +51,7 @@
"footer.scratchFamily": "Scratch Family",
"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.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",
@ -94,4 +94,4 @@
"welcome.learn": "Learn how to make a project in Scratch",
"welcome.tryOut": "Try out starter projects",
"welcome.connect": "Connect with other Scratchers"
}
}

4
src/main.scss
View file

@ -35,6 +35,10 @@ h4 {
font-size: 1.0rem;
}
p.legal {
font-size: .8rem;
}
/* Links */
a {
white-space: nowrap;

15
src/views/hoc/hoc.jsx
View file

@ -133,7 +133,7 @@ var Hoc = React.createClass({
<FormattedHTMLMessage
id='hoc.activityCardsInfo1'
defaultMessage={
'Want tips and ideas for these Hour of Code activities? ' +
'Want tips and ideas for these Hour of Code&trade; activities? ' +
'Use the activity cards to get ideas for creating with ' +
'Scratch. Facilitator guides can help you plan ' +
'a group activity.'
@ -380,6 +380,19 @@ var Hoc = React.createClass({
<img src="/images/hoc2015/pocketcode-logo.png" />
</a>
</div>
<div className="trademark">
<p className="legal">
<FormattedHTMLMessage
id='hoc.officialNotice'
defaultMessage={
'The "Hour of Code&trade;" is a nationwide initiative by ' +
'<a href="http://csedweek.org">Computer Science Education Week</a> ' +
'and <a href="http://code.org">Code.org</a> to introduce millions of ' +
'students to one hour of computer science and computer programming.'
} />
</p>
</div>
</section>
</div>
</div>

4
src/views/hoc/hoc.scss
View file

@ -250,4 +250,8 @@ $base-bg: $ui-white;
vertical-align: middle;
}
}
.trademark {
margin-top: 20px;
}
}