From ed6848cc144d3e177ed24cc389b13002dd51e48c Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Tue, 28 Oct 2014 15:51:41 -0700 Subject: [PATCH] fix floating column issue, add facebook auth back in, update nonprofit mailer title --- controllers/contact.js | 2 +- views/account/login.jade | 5 ++++- views/challenges/add-dynamic-content-to-your-website.jade | 1 - views/challenges/create-and-deploy-a-website.jade | 1 - .../challenges/experiment-with-html-and-css-in-codepen.jade | 1 - views/challenges/index.jade | 3 +-- views/challenges/start-a-pair-programming-session.jade | 1 - views/courses/code-school-discover-devtools-course.jade | 1 - views/courses/code-school-real-time-with-node-js-course.jade | 1 - .../code-school-shaping-up-with-angular-js-course.jade | 1 - views/courses/code-school-try-git-course.jade | 1 - views/courses/code-school-try-jquery-course.jade | 1 - views/courses/codecademy-html-and-css-track.jade | 1 - views/courses/codecademy-javascript-track.jade | 1 - ...harvard-introduction-to-computer-science-cs50-course.jade | 1 - views/courses/linux-command-line-tutorial.jade | 1 - .../m101js-mongodb-for-node-js-developers-course.jade | 1 - views/curriculum/curriculum.jade | 3 +-- 18 files changed, 7 insertions(+), 20 deletions(-) diff --git a/controllers/contact.js b/controllers/contact.js index ee953b1cfe..c507ade797 100644 --- a/controllers/contact.js +++ b/controllers/contact.js @@ -43,7 +43,7 @@ exports.postContact = function(req, res) { var name = req.body.name; var body = req.body.message; var to = 'michaelqlarson@gmail.com'; - var subject = 'Free Code Camp'; + var subject = 'CodeNonprofit Project Idea'; var mailOptions = { to: to, diff --git a/views/account/login.jade b/views/account/login.jade index 182535b139..e57d358a15 100644 --- a/views/account/login.jade +++ b/views/account/login.jade @@ -2,10 +2,13 @@ extends ../layout block content .page-header - h3 Sign in to Free Code Camp with one of these social network accounts: + h3 Sign in to Free Code Camp with any of these social network accounts: a.btn.btn-block.btn-linkedin.btn-social(href='/auth/linkedin') i.fa.fa-linkedin | Sign in with LinkedIn + a.btn.btn-block.btn-facebook.btn-social(href='/auth/facebook') + i.fa.fa-facebook + | Sign in with Facebook a.btn.btn-block.btn-twitter.btn-social(href='/auth/twitter') i.fa.fa-twitter | Sign in with Twitter \ No newline at end of file diff --git a/views/challenges/add-dynamic-content-to-your-website.jade b/views/challenges/add-dynamic-content-to-your-website.jade index 845a421f2a..dcc340d122 100644 --- a/views/challenges/add-dynamic-content-to-your-website.jade +++ b/views/challenges/add-dynamic-content-to-your-website.jade @@ -5,5 +5,4 @@ block content include ./partials/challenge .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses \ No newline at end of file diff --git a/views/challenges/create-and-deploy-a-website.jade b/views/challenges/create-and-deploy-a-website.jade index fad8cba2a9..e54d9be919 100644 --- a/views/challenges/create-and-deploy-a-website.jade +++ b/views/challenges/create-and-deploy-a-website.jade @@ -5,5 +5,4 @@ block content include ./partials/challenge .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/challenges/experiment-with-html-and-css-in-codepen.jade b/views/challenges/experiment-with-html-and-css-in-codepen.jade index fad8cba2a9..e54d9be919 100644 --- a/views/challenges/experiment-with-html-and-css-in-codepen.jade +++ b/views/challenges/experiment-with-html-and-css-in-codepen.jade @@ -5,5 +5,4 @@ block content include ./partials/challenge .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/challenges/index.jade b/views/challenges/index.jade index 53eb2c2fee..03a48f5b4c 100644 --- a/views/challenges/index.jade +++ b/views/challenges/index.jade @@ -2,5 +2,4 @@ extends ../layout block content each challenge in challenges li - a(href="/challenges/#{challenge._id}") #{challenge.name} - TEST \ No newline at end of file + a(href="/challenges/#{challenge._id}") #{challenge.name} \ No newline at end of file diff --git a/views/challenges/start-a-pair-programming-session.jade b/views/challenges/start-a-pair-programming-session.jade index fad8cba2a9..e54d9be919 100644 --- a/views/challenges/start-a-pair-programming-session.jade +++ b/views/challenges/start-a-pair-programming-session.jade @@ -5,5 +5,4 @@ block content include ./partials/challenge .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/courses/code-school-discover-devtools-course.jade b/views/courses/code-school-discover-devtools-course.jade index 443bec27cb..1c91a056bc 100644 --- a/views/courses/code-school-discover-devtools-course.jade +++ b/views/courses/code-school-discover-devtools-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses \ No newline at end of file diff --git a/views/courses/code-school-real-time-with-node-js-course.jade b/views/courses/code-school-real-time-with-node-js-course.jade index 443bec27cb..1c91a056bc 100644 --- a/views/courses/code-school-real-time-with-node-js-course.jade +++ b/views/courses/code-school-real-time-with-node-js-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses \ No newline at end of file diff --git a/views/courses/code-school-shaping-up-with-angular-js-course.jade b/views/courses/code-school-shaping-up-with-angular-js-course.jade index 704af18755..9fbf04afa9 100644 --- a/views/courses/code-school-shaping-up-with-angular-js-course.jade +++ b/views/courses/code-school-shaping-up-with-angular-js-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/courses/code-school-try-git-course.jade b/views/courses/code-school-try-git-course.jade index 704af18755..9fbf04afa9 100644 --- a/views/courses/code-school-try-git-course.jade +++ b/views/courses/code-school-try-git-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/courses/code-school-try-jquery-course.jade b/views/courses/code-school-try-jquery-course.jade index 704af18755..9fbf04afa9 100644 --- a/views/courses/code-school-try-jquery-course.jade +++ b/views/courses/code-school-try-jquery-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/courses/codecademy-html-and-css-track.jade b/views/courses/codecademy-html-and-css-track.jade index 704af18755..9fbf04afa9 100644 --- a/views/courses/codecademy-html-and-css-track.jade +++ b/views/courses/codecademy-html-and-css-track.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/courses/codecademy-javascript-track.jade b/views/courses/codecademy-javascript-track.jade index 443bec27cb..1c91a056bc 100644 --- a/views/courses/codecademy-javascript-track.jade +++ b/views/courses/codecademy-javascript-track.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses \ No newline at end of file diff --git a/views/courses/harvard-introduction-to-computer-science-cs50-course.jade b/views/courses/harvard-introduction-to-computer-science-cs50-course.jade index 443bec27cb..1c91a056bc 100644 --- a/views/courses/harvard-introduction-to-computer-science-cs50-course.jade +++ b/views/courses/harvard-introduction-to-computer-science-cs50-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses \ No newline at end of file diff --git a/views/courses/linux-command-line-tutorial.jade b/views/courses/linux-command-line-tutorial.jade index 443bec27cb..1c91a056bc 100644 --- a/views/courses/linux-command-line-tutorial.jade +++ b/views/courses/linux-command-line-tutorial.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses \ No newline at end of file diff --git a/views/courses/m101js-mongodb-for-node-js-developers-course.jade b/views/courses/m101js-mongodb-for-node-js-developers-course.jade index 704af18755..9fbf04afa9 100644 --- a/views/courses/m101js-mongodb-for-node-js-developers-course.jade +++ b/views/courses/m101js-mongodb-for-node-js-developers-course.jade @@ -5,5 +5,4 @@ block content include ./partials/course .col-sm-12.col-md-4.col-xs-12 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12 include ./../partials/courses diff --git a/views/curriculum/curriculum.jade b/views/curriculum/curriculum.jade index 2eecf43947..a02ad24526 100644 --- a/views/curriculum/curriculum.jade +++ b/views/curriculum/curriculum.jade @@ -17,7 +17,6 @@ block content 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. - .col-sm-12.col-md-4.col-xs-12.animated.fadeInDown + .col-sm-12.col-md-4.col-xs-12.animated.fadeInUp.delay-1 include ./../partials/challenges - .col-sm-12.col-md-4.col-xs-12.animated.fadeInUp include ./../partials/courses \ No newline at end of file