From a740bfd8bdffc9e6337550018de20e057d0c33ce Mon Sep 17 00:00:00 2001 From: Alexandru Ungurianu Date: Sat, 6 Jun 2015 14:38:43 +0300 Subject: [PATCH 1/2] Fixed typo in Get Set for Ziplines waypoint. Changed "Click the gear next the JavaScript." to "Click the gear next to the JavaScript." --- seed_data/challenges/ziplines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_data/challenges/ziplines.json b/seed_data/challenges/ziplines.json index 9e30a86a8c..2b52af4318 100644 --- a/seed_data/challenges/ziplines.json +++ b/seed_data/challenges/ziplines.json @@ -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.", "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: <h1 class='text-primary'>Hello CodePen!</h1>. 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: $(document).ready(function() { $('.text-primary').text('Hi CodePen!') });. 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." ], From ef504339cca47f74bb7acd4fa8642f0081c5842a Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 6 Jun 2015 10:17:49 -0700 Subject: [PATCH 2/2] remove saturday summit modal --- views/challengeMap/show.jade | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index bab60b1cc4..f8adbff6c1 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -83,22 +83,22 @@ block content li.large-p.negative-10 a(href="/challenges/#{challenge.name}")= challenge.name - #announcementModal.modal(tabindex='-1') - .modal-dialog.animated.fadeInUp.fast-animation - .modal-content - .modal-header.challenge-list-header Join our Saturday Summit! - a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × - .modal-body - 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.   - 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-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! - script. - $(document).ready(function () { - if (!localStorage || !localStorage.day234) { - $('#announcementModal').modal('show'); - localStorage.day234 = "true"; - } - }); + //#announcementModal.modal(tabindex='-1') + // .modal-dialog.animated.fadeInUp.fast-animation + // .modal-content + // .modal-header.challenge-list-header Join our Saturday Summit! + // a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × + // .modal-body + // 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.   + // 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-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! + //script. + // $(document).ready(function () { + // if (!localStorage || !localStorage.day234) { + // $('#announcementModal').modal('show'); + // localStorage.day234 = "true"; + // } + // });