diff --git a/public/css/main.less b/public/css/main.less index 0542c37eb6..93f4af5a03 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -5,8 +5,6 @@ @import "lib/animate.min.less"; @import url(http://fonts.googleapis.com/css?family=Lato:300); -@import url(http://fonts.googleapis.com/css?family=Lato:400); -@import url(http://fonts.googleapis.com/css?family=Lato:500); html,body,div,span,a,li,td,th { @@ -14,6 +12,17 @@ html,body,div,span,a,li,td,th { font-weight: 300; } +li { + white-space: pre; /* CSS 2.0 */ + white-space: pre-wrap; /* CSS 2.1 */ + white-space: pre-line; /* CSS 3.0 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: -moz-pre-wrap; /* Mozilla */ + white-space: -hp-pre-wrap; /* HP Printers */ + word-wrap: break-word; /* IE 5+ */ +} + html { position: relative; min-height: 100%; diff --git a/seed_data/challenges.json b/seed_data/challenges.json index 20765f1164..86bd9bf992 100644 --- a/seed_data/challenges.json +++ b/seed_data/challenges.json @@ -240,7 +240,9 @@ "time": 120, "video": "114597348", "challengeNumber": 19, - "steps": ["Now let's tackle week 2 of Stanford's Intro to Computer Science course.", + "steps": [ + "Now let's tackle week 2 of Stanford's Intro to Computer Science course.", + "This will introduce us to loops, a fundamental feature of every programming language.", "Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z100/a7a70ce6e4724c58862ee6007284face/ and complete Week 2."] }, { @@ -248,21 +250,31 @@ "time": 120, "video": "114597347", "challengeNumber": 20, - "steps": ["Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z143/z101/ and complete Week 3."] + "steps": [ + "Week 3 of Stanford's Intro to Computer Science covers computer hardware and explains Moore's law of exponential growth in the price-performance of processors.", + "This challenge will also give you an understanding of how bits and bytes work.", + "Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z143/z101/ and complete Week 3." + ] }, { "name": "Learn Computer Networking", "time": 120, "video": "114604811", "challengeNumber": 21, - "steps": ["Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z187/z144/ and complete Week 4."] + "steps": [ + "Now that you've learned about computer hardware, it's time to learn about the software that runs on top of it.", + "Particularly important, you will learn about networks and TCP/IP - the protocol that powers the internet.", + "Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z187/z144/ and complete Week 4."] }, { "name": "Learn Boolean Logic", "time": 120, "video": "114604812", "challengeNumber": 22, - "steps": ["Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z208/z188/ and complete Week 5."] + "steps": [ + "Now we'll do some more table exercises and learn boolean logic.", + "We'll also learn the difference between digital data and analog data.", + "Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z208/z188/ and complete Week 5."] }, { "name": "Learn Computer Security", @@ -271,6 +283,8 @@ "challengeNumber": 23, "steps": [ "We're almost done with Stanford's Introduction to Computer Science course!", + "We'll learn about one of the most important inventions of the 20th century - spreadsheets.", + "We'll also learn about Computer Security and some of the more common vulnerabilities software systems have.", "Go to https://class.stanford.edu/courses/Engineering/CS101/Summer2014/courseware/z229/z213/ and complete Week 6, the final week of the course."] }, { diff --git a/views/partials/about-us.jade b/views/partials/about-us.jade index aa069d3d26..85253b8160 100644 --- a/views/partials/about-us.jade +++ b/views/partials/about-us.jade @@ -4,6 +4,27 @@ .landing-panel-body.text-center .col-xs-12 .masonry-row + .masonry-block + .masonry-relative + blockquote.twitter-tweet(lang='en') + p + | My boss was impressed by the troubleshooting I learned through + a(href='https://twitter.com/FreeCodeCamp') @FreeCodeCamp + | and I just got a raise! Sweet! + a(href='http://t.co/om7DqQoyAr') http://t.co/om7DqQoyAr + | — Alec Hansen (@AlecMHansen) + a(href='https://twitter.com/AlecMHansen/status/544975882771648512') December 16, 2014 + script(async='', src='//platform.twitter.com/widgets.js', charset='utf-8') + .masonry-block + .masonry-relative + blockquote.twitter-tweet(lang='en') + p + a(href='https://twitter.com/DrivenByTatiana') @DrivenByTatiana + a(href='https://twitter.com/FreeCodeCamp') @FreeCodeCamp + | - Cool. I'm currently working thru it to improve my JavaScript. The community is very welcoming! 😄 + | — a touch of curaré (@cynthialanel) + a(href='https://twitter.com/cynthialanel/status/544768565467807744') December 16, 2014 + script(async='', src='//platform.twitter.com/widgets.js', charset='utf-8') .masonry-block .masonry-relative blockquote.twitter-tweet(lang='en')