Merge branch 'master' into challenges

app.js

@@ -128,6 +128,7 @@ app.get('/learn-to-code', resourcesController.learnToCode);
 app.get('/privacy', resourcesController.privacy);
 app.get('/jquery-exercises', resourcesController.jqueryExercises);
 app.get('/text-based-adventure-tutorial-app', resourcesController.textBasedAdventureTutorial);
+app.get('/chromebook', resourcesController.chromebook);
 app.get('/programmer-interview-questions-app', resourcesController.programmerInterviewQuestionsApp);
 app.get('/about', resourcesController.about);
 app.get('/login', userController.getLogin);

controllers/resources.js

@@ -15,6 +15,12 @@ exports.privacy = function(req, res) {
     });
 }
 
+exports.chromebook = function(req, res) {
+    res.render('chromebook',  {
+        title: 'Win a Chromebook'
+    });
+}
+
 exports.jqueryExercises = function(req, res) {
     res.render('jquery-exercises',  {
         title: 'jQuery Exercises'

public/css/main.less

@@ -154,6 +154,7 @@ ul {
 
 .nav-height {
   height: 50px;
+  border: none;
 }
 
 .landing-icon {
@@ -172,6 +173,10 @@ ul {
   margin-top: -10px;
 }
 
+.negative-15 {
+  margin-top: -15px;
+}
+
 .landing-p {
   font-size: 18px !important;
 }
@@ -180,11 +185,6 @@ ul {
   color: @brand-success;
 }
 
-.delay-half {
-  -webkit-animation-delay: 0.5s;
-  animation-delay: 0.5s;
-}
-
 .delay-1 {
   -webkit-animation-delay: 1s;
   animation-delay: 1s;
@@ -195,24 +195,9 @@ ul {
   animation-delay: 2s;
 }
 
-.delay-3 {
+.delay-10 {
-  -webkit-animation-delay: 3s;
+  -webkit-animation-delay: 10s;
-  animation-delay: 3s;
+  animation-delay: 10s;
-}
-
-.delay-4 {
-  -webkit-animation-delay: 4s;
-  animation-delay: 4s;
-}
-
-.delay-5 {
-  -webkit-animation-delay: 5s;
-  animation-delay: 5s;
-}
-
-.delay-6 {
-  -webkit-animation-delay: 6s;
-  animation-delay: 6s;
 }
 
 .fast-animation {
@@ -220,11 +205,6 @@ ul {
   animation-duration: 0.5s;
 }
 
-.slow-animation {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s;
-}
-
 .disabled {
   pointer-events: none;
   cursor: default;
@@ -282,7 +262,7 @@ ul {
 }
 
 .hug-top {
-  margin-top: -40px;
+  margin-top: -35px;
   margin-bottom: -10px;
 }
 

views/chromebook.jade

@@ -0,0 +1,13 @@
+extends layout
+block content
+    .jumbotron.negative-15.text-center
+        h1.hug-top Win a Chromebook
+        h2 Quincy won a Chromebook at a San Francisco HTML5 meetup at Google.
+        h3 He wants to give it to someone who needs it.
+        img.image-responsive(src="https://s3.amazonaws.com/freecodecamp/chromebook.jpg" alt="HP Chromebook 11")
+        script(src='//widget-prime.rafflecopter.com/launch.js')
+        a#rcwidget_a7khonhd.rcptr(href='http://www.rafflecopter.com/rafl/display/d70901b10/', rel='nofollow', data-raflid='d70901b10', data-theme='classic', data-template='') a Rafflecopter giveaway
+        .animated.zoomInDown.delay-10
+            p Finished signing up for the giveaway?
+            a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
+        br

views/home.jade

@@ -1,6 +1,6 @@
 extends layout
 block content
-    .jumbotron
+    .jumbotron.negative-15
         .text-center
             h1.hug-top Code with Us
             h2 Let's learn to code by building projects for nonprofits
@@ -38,10 +38,3 @@ block content
     include partials/about-us
     br
     include partials/faq
-    br
-    .jumbotron
-        .text-center
-            a.btn.btn-cta.signup-btn.cta.btn-primary(href="/login") Start learning to code (it's free)
-            br
-            br
-            a.btn.nonprofit-cta.btn-success(href="/nonprofits") I'm with a nonprofit and want help coding something

views/partials/about-us.jade

@@ -1,97 +1,7 @@
 .panel.panel-primary
-    .panel-heading.landing-panel-heading.text-center We are Free Code Camp
+    .panel-heading.landing-panel-heading.text-center What Our Code Campers are Saying
     .panel-body
         .landing-panel-body.text-center
-            .col-xs-12
-                h2.text-center Our team
-                .fifteen-pixel-break
-            script.
-                $(function () {
-                    var parent = $("#shuffle");
-                    var divs = parent.children();
-                    while (divs.length) {
-                        parent.append(divs.splice(Math.floor(Math.random() * divs.length), 1)[0]);
-                    }
-                });
-            #shuffle
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Nique Devereaux
-                    h4.negative-10.text-nowrap Alliance Builder
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/nique-devereaux.jpg' alt="Nique Devereaux's picture")
-                    h4.text-nowrap Tempe, Arizona
-                    p.negative-10 "Gamer ever since Pong. Coder ever since I discovered how much I enjoy telling machines what to do."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Berkeley Martinez
-                    h4.negative-10.text-nowrap JavaScript Engineer
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/berkeley-martinez.jpg' alt="Berkeley Martinez's picture")
-                    h4.text-nowrap San Francisco, California
-                    p.negative-10 "Former mechanical engineer. Coding is pure creation. I can fly, but only once."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Mychael Zuniga
-                    h4.negative-10.text-nowrap JavaScript Engineer
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/mychael-zuniga.jpg' alt="Mychael Zuniga's picture")
-                    h4.text-nowrap San Diego, California
-                    p.negative-10 "I'm a college student who turned to code as an avenue for creative expression. I love political science and economics."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Brian Ball
-                    h4.negative-10.text-nowrap Product Manager
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/brian-ball.jpg' alt="Brian Ball's picture")
-                    h4.text-nowrap San Francisco, California
-                    p.negative-10 "I build products people use. I'm fascinated by how fast the internet is changing the world."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Darryl Dixon
-                    h4.negative-10.text-nowrap Community Builder
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/darryl-dixon.jpg' alt="Darryl Dixon's picture")
-                    h4.text-nowrap Newport News, Virginia
-                    p.negative-10 "I'm a self-taught graphic designer. I'm learning web development here and want you to learn with me."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Kathy O'Driscoll
-                    h4.negative-10.text-nowrap Community Builder
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/kathy-odriscoll.jpg' alt="Kathy O'Driscoll's picture")
-                    h4.text-nowrap Los Angeles, California
-                    p.negative-10 "Mother and grandmother. All my life I've dabbled in getting machines to do my bidding. Now it's becoming my career."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Ryan Malm
-                    h4.negative-10.text-nowrap Visual Designer
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/ryan-malm.jpg' alt="Ryan Malm's picture")
-                    h4.text-nowrap Omaha, Nebraska
-                    p.negative-10 "I love origami, piano, and playing minecraft with my kids. My JavaScript grows stronger every day."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Charles Watson
-                    h4.negative-10.text-nowrap iOS Engineer
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/charles-watson.jpg' alt="Charles Watson's picture")
-                    h4.text-nowrap Minneapolis, Minnesota
-                    p.negative-10 "I skipped college. I build iOS apps. I love the obstacles and puzzles that coding presents me."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Quincy Larson
-                    h4.negative-10.text-nowrap Instructional Designer
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/quincy-larson.jpg' alt="Quincy Larson's picture")
-                    h4.text-nowrap San Francisco, California
-                    p.negative-10 "I worked as a school director in China before learning to code. It's clear that everyone can - and should - learn to code."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Mark Howard
-                    h4.negative-10.text-nowrap Digital Marketer
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/mark-howard.jpg' alt="Mark Howard's picture")
-                    h4.text-nowrap San Diego, California
-                    p.negative-10 "I enjoy helping people, at scale. Code is the best way to do that."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Nathan Leniz
-                    h4.negative-10.text-nowrap Community Builder
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/nathan-leniz.jpg' alt="Nathan Leniz's picture")
-                    h4.text-nowrap Seoul, South Korea
-                    p.negative-10 "I learned to code for the games, and stayed for the algorithms."
-                .col-xs-12.col-sm-4.col-md-3.team-member
-                    h3.negative-10.text-nowrap Jason Rueckert
-                    h4.negative-10.text-nowrap Live Content Manager
-                    img.profile-image(src='https://s3.amazonaws.com/freecodecamp/jason-rueckert.jpg' alt="Jason Rueckert's picture")
-                    h4.text-nowrap Seattle, Washington
-                    p.negative-10 "My high school job was testing basketball shoes for Nike. I learned code to work smarter, not harder. I have no thyroid."
-            .col-xs-12
-                h2.text-center Our chat room
-                .embed-responsive.embed-responsive-4by3
-                    iframe(style="display: none;" onload="this.style.display='block';" src="https://gitter.im/FreeCodeCamp/FreeCodeCamp")
-            .col-xs-12
-                h2.text-center What our students are saying
             .col-xs-12
                 .masonry-row
                     .masonry-block
@@ -220,21 +130,6 @@
                                 | — Angel Jose (@ajose01)
                                 a(href='https://twitter.com/ajose01/status/532729251754033152') November 13, 2014
                             script(async='', src='//platform.twitter.com/widgets.js', charset='utf-8')
-                    .masonry-block
-                        .masonry-relative
-                            blockquote.twitter-tweet(lang='en')
-                                p
-                                    | no school today: with
-                                    a(href='https://twitter.com/BlueninjaSF') @blueninjaSF
-                                    |  at
-                                    a(href='https://twitter.com/AWSloft') @awsloft
-                                    |  working on
-                                    a(href='https://twitter.com/FreeCodeCamp') @freecodecamp
-                                    |  - first website. check!
-                                    a(href='http://t.co/yJ8ycEti9B') pic.twitter.com/yJ8ycEti9B
-                                | — brian ball (@brianball)
-                                a(href='https://twitter.com/brianball/status/532243325290827777') November 11, 2014
-                            script(async='', src='//platform.twitter.com/widgets.js', charset='utf-8')
                     .masonry-block
                         .masonry-relative
                             blockquote.twitter-tweet(lang='en')
@@ -250,3 +145,91 @@
                                 | — Deb Simon-Heinfeld (@debBlufftonAGS)
                                 a(href='https://twitter.com/debBlufftonAGS/status/532198725129867265') November 11, 2014
                             script(async='', src='//platform.twitter.com/widgets.js', charset='utf-8')
+
+
+.panel.panel-primary
+    .panel-heading.landing-panel-heading.text-center Our Team of Volunteers
+    .panel-body
+        .landing-panel-body.text-center
+            .col-xs-12
+                script.
+                    $(function () {
+                        var parent = $("#shuffle");
+                        var divs = parent.children();
+                        while (divs.length) {
+                            parent.append(divs.splice(Math.floor(Math.random() * divs.length), 1)[0]);
+                        }
+                    });
+                #shuffle
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Nique Devereaux
+                        h4.negative-10.text-nowrap Alliance Builder
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/nique-devereaux.jpg' alt="Nique Devereaux's picture")
+                        h4.text-nowrap Tempe, Arizona
+                        p.negative-10 "Gamer ever since Pong. Coder ever since I discovered how much I enjoy telling machines what to do."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Berkeley Martinez
+                        h4.negative-10.text-nowrap JavaScript Engineer
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/berkeley-martinez.jpg' alt="Berkeley Martinez's picture")
+                        h4.text-nowrap San Francisco, California
+                        p.negative-10 "Former mechanical engineer. Coding is pure creation. I can fly, but only once."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Mychael Zuniga
+                        h4.negative-10.text-nowrap JavaScript Engineer
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/mychael-zuniga.jpg' alt="Mychael Zuniga's picture")
+                        h4.text-nowrap San Diego, California
+                        p.negative-10 "I'm a college student who turned to code as an avenue for creative expression. I love political science and economics."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Brian Ball
+                        h4.negative-10.text-nowrap Product Manager
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/brian-ball.jpg' alt="Brian Ball's picture")
+                        h4.text-nowrap San Francisco, California
+                        p.negative-10 "I build products people use. I'm fascinated by how fast the internet is changing the world."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Darryl Dixon
+                        h4.negative-10.text-nowrap Community Builder
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/darryl-dixon.jpg' alt="Darryl Dixon's picture")
+                        h4.text-nowrap Newport News, Virginia
+                        p.negative-10 "I'm a self-taught graphic designer. I'm learning web development here and want you to learn with me."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Kathy O'Driscoll
+                        h4.negative-10.text-nowrap Community Builder
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/kathy-odriscoll.jpg' alt="Kathy O'Driscoll's picture")
+                        h4.text-nowrap Los Angeles, California
+                        p.negative-10 "Mother and grandmother. All my life I've dabbled in getting machines to do my bidding. Now it's becoming my career."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Ryan Malm
+                        h4.negative-10.text-nowrap Visual Designer
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/ryan-malm.jpg' alt="Ryan Malm's picture")
+                        h4.text-nowrap Omaha, Nebraska
+                        p.negative-10 "I love origami, piano, and playing minecraft with my kids. My JavaScript grows stronger every day."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Charles Watson
+                        h4.negative-10.text-nowrap iOS Engineer
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/charles-watson.jpg' alt="Charles Watson's picture")
+                        h4.text-nowrap Minneapolis, Minnesota
+                        p.negative-10 "I skipped college. I build iOS apps. I love the obstacles and puzzles that coding presents me."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Quincy Larson
+                        h4.negative-10.text-nowrap Instructional Designer
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/quincy-larson.jpg' alt="Quincy Larson's picture")
+                        h4.text-nowrap San Francisco, California
+                        p.negative-10 "I worked as a school director in China before learning to code. It's clear that everyone can - and should - learn to code."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Mark Howard
+                        h4.negative-10.text-nowrap Digital Marketer
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/mark-howard.jpg' alt="Mark Howard's picture")
+                        h4.text-nowrap San Diego, California
+                        p.negative-10 "I enjoy helping people, at scale. Code is the best way to do that."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Nathan Leniz
+                        h4.negative-10.text-nowrap Community Builder
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/nathan-leniz.jpg' alt="Nathan Leniz's picture")
+                        h4.text-nowrap Seoul, South Korea
+                        p.negative-10 "I learned to code for the games, and stayed for the algorithms."
+                    .col-xs-12.col-sm-4.col-md-3.team-member
+                        h3.negative-10.text-nowrap Jason Rueckert
+                        h4.negative-10.text-nowrap Live Content Manager
+                        img.profile-image(src='https://s3.amazonaws.com/freecodecamp/jason-rueckert.jpg' alt="Jason Rueckert's picture")
+                        h4.text-nowrap Seattle, Washington
+                        p.negative-10 "My high school job was testing basketball shoes for Nike. I learned code to work smarter, not harder. I have no thyroid."

views/partials/faq.jade

@@ -70,3 +70,12 @@
                     h2 Does Free Code Camp have an application process?
                     ul
                         p.landing-p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and nonprofits' projects, you will become an employable software engineer.
+                    br
+                    br
+                    .text-center
+                        a.btn.btn-cta.signup-btn.cta.btn-primary(href="/login") Start learning to code (it's free)
+                        br
+                        br
+                        a.btn.nonprofit-cta.btn-success(href="/nonprofits") I'm with a nonprofit and want help coding something
+                    br
+                    br