gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp

Browse Source
This commit is contained in:
terakilobyte
2015-06-06 20:11:28 -04:00
parent e5a8c27e07 debb746222
commit 426a1c27c2
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seed_data/challenges/ziplines.json
View File

@ -18,7 +18,7 @@
"Drag the windows around and press the buttons in the lower-right hand corner to change the orientation to suit your preference.", "Drag the windows around and press the buttons in the lower-right hand corner to change the orientation to suit your preference.",
"Click the gear next to CSS. Then in the \"External CSS File or Another Pen\" text field, type \"bootstrap\" and scroll down until you see the latest version of Bootstrap. Click it.", "Click the gear next to CSS. Then in the \"External CSS File or Another Pen\" text field, type \"bootstrap\" and scroll down until you see the latest version of Bootstrap. Click it.",
"Verify that bootstrap is active by adding the following code to your HTML: <code>&lt;h1 class='text-primary'&gt;Hello CodePen!&lt;/h1&gt;</code>. The text's color should be Bootstrap blue.", "Verify that bootstrap is active by adding the following code to your HTML: <code>&lt;h1 class='text-primary'&gt;Hello CodePen!&lt;/h1&gt;</code>. The text's color should be Bootstrap blue.",
"Click the gear next the JavaScript. Click the \"Latest version of...\" select box and choose jQuery.", "Click the gear next to the JavaScript. Click the \"Latest version of...\" select box and choose jQuery.",
"Now add the following code to your JavaScript: <code>$(document).ready(function() { $('.text-primary').text('Hi CodePen!') });</code>. Click the \"Save\" button at the top. Your \"Hello CodePen!\" should change to \"Hi CodePen!\". This means that jQuery is working.", "Now add the following code to your JavaScript: <code>$(document).ready(function() { $('.text-primary').text('Hi CodePen!') });</code>. Click the \"Save\" button at the top. Your \"Hello CodePen!\" should change to \"Hi CodePen!\". This means that jQuery is working.",
"Now you're ready for your first Zipline. Click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair." "Now you're ready for your first Zipline. Click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair."
], ],

38
views/challengeMap/show.jade
View File

@ -83,22 +83,22 @@ block content
li.large-p.negative-10 li.large-p.negative-10
a(href="/challenges/#{challenge.name}")= challenge.name a(href="/challenges/#{challenge.name}")= challenge.name
#announcementModal.modal(tabindex='-1') //#announcementModal.modal(tabindex='-1')
.modal-dialog.animated.fadeInUp.fast-animation // .modal-dialog.animated.fadeInUp.fast-animation
.modal-content // .modal-content
.modal-header.challenge-list-header Join our Saturday Summit! // .modal-header.challenge-list-header Join our Saturday Summit!
a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × // a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
.modal-body // .modal-body
h3.text-left Saturday at Noon EDT: We'll live-stream our Saturday Summit on Twitch.tv. // h3.text-left Saturday at Noon EDT: We'll live-stream our Saturday Summit on Twitch.tv.
h3.text-left We'll announce our new Front End Development Certificate Program (it's free, of course) and our new "Free Code Camp On The Go" app. &thinsp; // h3.text-left We'll announce our new Front End Development Certificate Program (it's free, of course) and our new "Free Code Camp On The Go" app. &thinsp;
a(href='http://www.freecodecamp.com/twitch', target='_blank') Add us to your calendar here // a(href='http://www.freecodecamp.com/twitch', target='_blank') Add us to your calendar here
| . // | .
a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='http://twitch.tv/freecodecamp', target='_blank') Follow us on Twitch.tv // a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='http://twitch.tv/freecodecamp', target='_blank') Follow us on Twitch.tv
a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! // a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
script. //script.
$(document).ready(function () { // $(document).ready(function () {
if (!localStorage || !localStorage.day234) { // if (!localStorage || !localStorage.day234) {
$('#announcementModal').modal('show'); // $('#announcementModal').modal('show');
localStorage.day234 = "true"; // localStorage.day234 = "true";
} // }
}); // });