From 5de070aca414a62070afc862767d6f8ae973935b Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 11 Dec 2014 17:59:01 -0800 Subject: [PATCH 1/4] more changes recommended by Ryan --- public/css/main.less | 7 ++++++- views/home.jade | 11 ++--------- views/partials/faq.jade | 11 ++++++++++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/public/css/main.less b/public/css/main.less index 0623f097fc..bcb348a73c 100644 --- a/public/css/main.less +++ b/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; } @@ -282,7 +287,7 @@ ul { } .hug-top { - margin-top: -40px; + margin-top: -35px; margin-bottom: -10px; } diff --git a/views/home.jade b/views/home.jade index 4f2f4316ca..47305dee19 100644 --- a/views/home.jade +++ b/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 @@ -37,11 +37,4 @@ block content br 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 \ No newline at end of file + include partials/faq \ No newline at end of file diff --git a/views/partials/faq.jade b/views/partials/faq.jade index 02fe5a5225..52618260f8 100644 --- a/views/partials/faq.jade +++ b/views/partials/faq.jade @@ -69,4 +69,13 @@ p.landing-p Our name is Free Code Camp. We are a free code camp. If you had to pay us (or sign over future earnings), we'd have to change our name. And we are not going to do that. 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. \ No newline at end of file + 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 \ No newline at end of file From c72dfb32bd385a0e50ccbc6c55374575187982ae Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 11 Dec 2014 21:24:44 -0800 Subject: [PATCH 2/4] add chromebook promo --- app.js | 1 + controllers/resources.js | 6 ++++++ views/chromebook.jade | 7 +++++++ .../{partials => }/programmer-interview-questions-app.jade | 0 .../{partials => }/text-based-adventure-tutorial-app.jade | 0 5 files changed, 14 insertions(+) create mode 100644 views/chromebook.jade rename views/{partials => }/programmer-interview-questions-app.jade (100%) rename views/{partials => }/text-based-adventure-tutorial-app.jade (100%) diff --git a/app.js b/app.js index 1fb0227703..337ff4769f 100644 --- a/app.js +++ b/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); diff --git a/controllers/resources.js b/controllers/resources.js index a1c435a8e9..d4844a83f4 100644 --- a/controllers/resources.js +++ b/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' diff --git a/views/chromebook.jade b/views/chromebook.jade new file mode 100644 index 0000000000..8025d19155 --- /dev/null +++ b/views/chromebook.jade @@ -0,0 +1,7 @@ +extends layout +block content + .jumbotron + 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 + + diff --git a/views/partials/programmer-interview-questions-app.jade b/views/programmer-interview-questions-app.jade similarity index 100% rename from views/partials/programmer-interview-questions-app.jade rename to views/programmer-interview-questions-app.jade diff --git a/views/partials/text-based-adventure-tutorial-app.jade b/views/text-based-adventure-tutorial-app.jade similarity index 100% rename from views/partials/text-based-adventure-tutorial-app.jade rename to views/text-based-adventure-tutorial-app.jade From d38e31d06513cb02c64143ed6919248c65dc5db5 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 11 Dec 2014 23:07:33 -0800 Subject: [PATCH 3/4] update the chromebook raffle page --- public/css/main.less | 31 +++---------------------------- views/chromebook.jade | 12 +++++++++--- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/public/css/main.less b/public/css/main.less index bcb348a73c..93457c6604 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -185,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; @@ -200,24 +195,9 @@ ul { animation-delay: 2s; } -.delay-3 { - -webkit-animation-delay: 3s; - animation-delay: 3s; -} - -.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; +.delay-10 { + -webkit-animation-delay: 10s; + animation-delay: 10s; } .fast-animation { @@ -225,11 +205,6 @@ ul { animation-duration: 0.5s; } -.slow-animation { - -webkit-animation-duration: 2s; - animation-duration: 2s; -} - .disabled { pointer-events: none; cursor: default; diff --git a/views/chromebook.jade b/views/chromebook.jade index 8025d19155..a16e21477f 100644 --- a/views/chromebook.jade +++ b/views/chromebook.jade @@ -1,7 +1,13 @@ extends layout block content - .jumbotron + .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 From f984d335f8d262230048a82f0d42f4f1ee93cd45 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Fri, 12 Dec 2014 09:40:57 -0800 Subject: [PATCH 4/4] update landing page to remove gitter --- views/partials/about-us.jade | 195 ++++++++++++++++------------------- 1 file changed, 89 insertions(+), 106 deletions(-) diff --git a/views/partials/about-us.jade b/views/partials/about-us.jade index 3a0d0b6474..aa069d3d26 100644 --- a/views/partials/about-us.jade +++ b/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." \ No newline at end of file