diff --git a/controllers/challenges.js b/controllers/challenges.js index c71d0832d8..0c2aae0730 100644 --- a/controllers/challenges.js +++ b/controllers/challenges.js @@ -67,7 +67,7 @@ exports.experimentWithHtmlAndCssInCodepen = function(req, res) { image: "http://www.designtrending.com/wp-content/uploads/2013/02/codepen_split.png", directions: [ "Let's put those HTML and CSS skills to work!", - "You'll create your own databaseless webpage. We'll show you how." + "You'll learn bootstrap and see how you can build websites right in your browser with CodePen." ], links: ["http://getbootstrap.com/", "http://www.usatoday.com/", "http://codepen.io/"], challenges: ["Load the USAToday.com page in CodePen.", "Find some cat pictures online, copy their image URLs, and change the USAToday.com page to use these cat pictures instead of its normal images.", "USATODAY.com uses a multi-column bootstrap layout. See if you can change the layout to be a single-column layout, even at full width. Hint: the \"row\" and \"col-\" classes control this. Check the Bootstrap documentation linked to above if you get stuck."] diff --git a/views/curriculum/curriculum.jade b/views/curriculum/curriculum.jade index ef2ec6b38d..62edcd485e 100644 --- a/views/curriculum/curriculum.jade +++ b/views/curriculum/curriculum.jade @@ -3,6 +3,25 @@ block content .row .col-sm-8.col-xs-12 h1 Welcome to Free Code Camp! + p Here are a few quick tips: + ol + li Work through our challenges in order. Many challenges are self-graded. If you want our feedback,  + a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") tweet a link to your project to @freecodecamp. + li If you get stuck, try working through our recommended (free) courses. They're super helpful, but totally optional. You can pair program on them, too. + li Challenge #2 will show you how to start a pair programming session. Pair program as much as possible. It's more fun, and you'll learn better that way. + p We're working to create more challenges. If you have an idea for a challenge you'd like us to implement,  + a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") tweet it to @freecodecamp. + br + br + br + br + br + br + br + br + br + br + br .col-sm-4.col-xs-12 include ./../partials/challenges diff --git a/views/partials/challenges.jade b/views/partials/challenges.jade index 5eaa62a623..32fab1fb75 100644 --- a/views/partials/challenges.jade +++ b/views/partials/challenges.jade @@ -6,16 +6,12 @@ ol li a(href="/challenges/create-and-deploy-a-website") Learn how to create a website and deploy it to the internet - |   (takes 10 minutes) li a(href="/challenges/start-a-pair-programming-session") Learn how to start Pair Programming session - |   (takes 10 minutes) li a(href="/challenges/add-dynamic-content-to-your-website") Learn how to add dynamic content to your website - |   (takes 10 minutes) li a(href="/challenges/experiment-with-html-and-css-in-codepen") Learn how to experiment with HTML and CSS in Codepen - |   (takes 10 minutes) li JavaScript and Computer Science: ul li Coming soon diff --git a/views/partials/courses.jade b/views/partials/courses.jade index a879246177..2d9294d861 100644 --- a/views/partials/courses.jade +++ b/views/partials/courses.jade @@ -5,18 +5,18 @@ li Web Design: ul li - a(href="/courses/codecademy-html-and-css-track") Codecademy's HTML & CSS Track + a(href="/courses/codecademy-html-and-css-track") Codecademy's HTML & CSS track li a(href="/courses/code-school-discover-devtools-course") Code School's Discover DevTools li - a(href="/courses/code-school-try-jquery-course") Code School's Try jQuery course + a(href="/courses/code-school-try-jquery-course") Code School's Try jQuery li JavaScript and Computer Science: ul li a(href="/courses/codecademy-javascript-track") Codecademy's JavaScript track ul li - a(href="/courses/harvard-introduction-to-computer-science-cs50-course") Harvard's Introduction to Computer Science (CS50) + a(href="/courses/harvard-introduction-to-computer-science-cs50-course") Harvard's CS50: Introduction to Computer Science li a(href="/courses/linux-command-line-tutorial") Linux Command Line tutorial li diff --git a/views/partials/footer.jade b/views/partials/footer.jade index 150020411d..2ff0b4acb7 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -1,12 +1,12 @@ .container .row - .col-xs-12.col-sm-6 + .col-xs-12.col-sm-8 a.btn.btn-success.btn-large.btn-block(href='https://www.hipchat.com/invite/178107/cc2f6ea4dfac9e48b9a88b305adae48a') Meet a new friend to pair program with in the Free Code Camp Chatroom .visible-xs br br br - .col-xs-12.col-sm-6 + .col-xs-12.col-sm-4 a.btn.btn-primary.btn-large.btn-block(href='http://twitter.com/intent/user?screen_name=FreeCodeCamp') Follow the discussion on Twitter