Merge branch 'bugfix/hoc-copy' into develop

This commit is contained in:
Andrew Sliwinski 2015-10-13 18:18:29 -04:00
commit 60d81cdca3
2 changed files with 33 additions and 30 deletions

View file

@ -55,7 +55,12 @@ var Hoc = React.createClass({
<section className="one-up"> <section className="one-up">
<div className="column"> <div className="column">
<h3>Activity Cards and Guides</h3> <h3>Activity Cards and Guides</h3>
<p>Print the Scratch cards for tips and ideas for each of the activities!</p> <p>
Want tips and ideas for your Hour-of-Code activities?&nbsp;
View and print activity cards and facilitator guides.
<br />
For more resources, see <a href="/help">Scratch Help</a>.
</p>
</div> </div>
<div className="resource"> <div className="resource">
@ -65,6 +70,7 @@ var Hoc = React.createClass({
<div className="file-size">13 mb</div> <div className="file-size">13 mb</div>
</div> </div>
</div> </div>
<div className="resource"> <div className="resource">
<img src="/svgs/tips-card.svg" /> <img src="/svgs/tips-card.svg" />
<div className="resource-info"> <div className="resource-info">
@ -72,6 +78,7 @@ var Hoc = React.createClass({
<div className="file-size">5 mb</div> <div className="file-size">5 mb</div>
</div> </div>
</div> </div>
<div className="resource"> <div className="resource">
<img src="/svgs/tips-card.svg" /> <img src="/svgs/tips-card.svg" />
<div className="resource-info"> <div className="resource-info">
@ -84,25 +91,17 @@ var Hoc = React.createClass({
<section className="two-up"> <section className="two-up">
<div className="column"> <div className="column">
<h3>Tips Window</h3> <h3>Tips Window</h3>
<p>New to Scratch or havent heard of the Tips Window? Check out interactive tutorials, <p>
handy block information, and other helpful hints in the new Need help getting started? Looking for ideas?&nbsp;
2015 <a href="/projects/editor/?tip_bar=home">Tips Window</a></p> You can find tutorials and helpful hints in the
<br />
<a href="/projects/editor/?tip_bar=home">Tips Window</a>
</p>
</div> </div>
<div className="column"> <div className="column">
<img src="/images/tips-test-animation.gif" /> <img src="/images/tips-test-animation.gif" />
</div> </div>
</section> </section>
<section className="one-up">
<div className="column">
<h3>Still Want More?</h3>
<p>
<strong>Go for it!</strong>&nbsp;
Try another tutorial from the Tips Window.&nbsp;
<a href="/projects/editor/?tip_bar=home">See all tips</a>
</p>
</div>
</section>
</Box> </Box>
</div> </div>
</div> </div>

View file

@ -146,6 +146,10 @@ $base-bg: $ui-white;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
&:last-child {
border-bottom: none;
}
h3, h3,
p { p {
font-weight: 300; font-weight: 300;