From 62bd350a291171d446a531ecc87e6d31d2ac278e Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 4 Feb 2015 12:52:19 -0800 Subject: [PATCH 1/5] expand landing page copy and update the faq parital --- views/home.jade | 9 +++++++-- views/partials/faq.jade | 7 ------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/views/home.jade b/views/home.jade index 650b1048f1..6fcec23b5d 100644 --- a/views/home.jade +++ b/views/home.jade @@ -68,14 +68,19 @@ block content .col-xs-12.col-sm-12.col-md-3 .landing-skill-icon.ion-ios-loop-strong h2.black-text Agile + br .big-break - h2   - h2 Why you should join our community: + h2 Why you should join our community right now: h3.col-xs-offset-0.col-sm-offset-1.col-md-offset-2 ul.text-left li.ion-code   We're thousands of professionals, all learning to code together li.ion-code   We're building projects for dozens of nonprofits li.ion-code   Our community is 100% free and open source + li.ion-code   You'll learn Full Stack JavaScript and become a Software Engineer + li.ion-code   You'll work through our focused, interactive courses and tutorials + li.ion-code   You'll learn to code at your own pace, in your browser or on your phone + li.ion-code   You'll become qualified for thousands of jobs currently going unfilled + li.ion-code   You can get help in real time from our community chat rooms and forum li.ion-code   We all share one goal: to boost our careers with code .big-break a.btn.btn-cta.signup-btn(href="/login") Learn to code today (it's free) \ No newline at end of file diff --git a/views/partials/faq.jade b/views/partials/faq.jade index f1acaa784f..569969a62e 100644 --- a/views/partials/faq.jade +++ b/views/partials/faq.jade @@ -72,10 +72,3 @@ p.landing-p Unlike coding 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 persevere, and keep working through our challenges and nonprofit projects, you will become an employable software engineer. br br - .text-center - a.btn.btn-cta.signup-btn.cta(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 From f2ad94d7c68abd8f2feac0e162e15dac2ef3018e Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 4 Feb 2015 13:04:51 -0800 Subject: [PATCH 2/5] add h1 text to bonfire, challenge and account views --- public/css/main.less | 6 ++++++ views/account/show.jade | 3 ++- views/bonfire/show.jade | 3 +-- views/challenges/show.jade | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/public/css/main.less b/public/css/main.less index ca77373c7b..8553d372bc 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -136,6 +136,12 @@ ul { font-size: 25px; } +.panel-heading > h1 { + font-size: 25px; + padding: 2px; + margin: 2px; +} + .navbar-brand { font-size: 26px; } diff --git a/views/account/show.jade b/views/account/show.jade index cae103557f..36a8122d3d 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -2,7 +2,8 @@ extends ../layout block content .col-xs-12.col-sm-12.col-md-12 .panel.panel-primary - .panel-heading.text-center #{username} + .panel-heading.text-center + h1 #{username}'s portfolio .panel-body .row .col-xs-12 diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade index 3fd59f5f69..75baa836ca 100644 --- a/views/bonfire/show.jade +++ b/views/bonfire/show.jade @@ -20,8 +20,7 @@ block content .row .col-xs-12.col-sm-12.col-md-4.bonfire-top #testCreatePanel - - h2.text-center= name + h1.text-center= name h2.text-center.bonfire-flames if (difficulty == "0") i.ion-ios-flame-outline diff --git a/views/challenges/show.jade b/views/challenges/show.jade index 13dc136c08..3e20d43033 100644 --- a/views/challenges/show.jade +++ b/views/challenges/show.jade @@ -3,7 +3,8 @@ block content .row .col-sm-12.col-md-12.col-xs-12 .panel.panel-primary - .panel-heading.text-center #{name} (takes #{time} minutes) + .panel-heading.text-center + h1 #{name} (takes #{time} minutes) script. var bonfireName = null; .panel.panel-body From 62abc4b3ee9be7381b42f98ee0adc3a68a287d0e Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 4 Feb 2015 15:26:13 -0800 Subject: [PATCH 3/5] update nonprofit project text and add footer back into landing page --- views/contact/nonprofits.jade | 2 +- views/partials/footer.jade | 39 +++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/views/contact/nonprofits.jade b/views/contact/nonprofits.jade index 7df7fe5ae5..f52f36bec9 100644 --- a/views/contact/nonprofits.jade +++ b/views/contact/nonprofits.jade @@ -11,7 +11,7 @@ block content ul li • Meet with them regularly to provide direction and answer questions li • Clearly communicate your project's goals: what will this project solve, and for whom? - li • Understand that they will build your project using JavaScript frameworks (as opposed to older or proprietary tools) + li • Understand that all our projects involve building new sites using modern JavaScript frameworks. We're happy to build a replacement for your old Wordpress or Drupal, but we cannot expand or maintain it. li • Keep your expectations high. Our students' goal is to produce work that's up to your standards h3 If you're OK with these terms, great! We'd love to help you! Fill in this form and we'll get right back to you. form.form-horizontal(role='form', action="/nonprofits/", method='POST', novalidate='novalidate', name='nonprofitForm') diff --git a/views/partials/footer.jade b/views/partials/footer.jade index 8651171bf6..7eab9a6f40 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -1,20 +1,19 @@ -- if (!landingPage) - .fcc-footer - .col-xs-12 - a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank') - |   - a.ion-social-twitch-outline(title="Free Code Camp Live Pair Programming on Twitch.TV", href="http://www.twitch.tv/freecodecamp", target='_blank') - |   - a.ion-social-github(title="Free Code Camp on GitHub", href="http://github.com/freecodecamp", target='_blank') - |   - a.ion-social-twitter(title="Free Code Camp on Twitter", href="http://twitter.com/freecodecamp", target='_blank') - |   - a.ion-social-facebook(title="Free Code Camp on Facebook", href="http://facebook.com/freecodecamp", target='_blank') - |   - a.ion-social-linkedin(title="Free Code Camp on LinkedIn", href="http://linkedin.com/company/4831032?free-code-camp", target='_blank') - |   - a.ion-information-circled(title="About Free Code Camp", href="/learn-to-code") - |   - a.ion-locked(title="Free Code Camp's Privacy Policy", href="/privacy") - |   - a.ion-code-working(title="Bonfire Coding Playground", href="/playground") \ No newline at end of file +.fcc-footer + .col-xs-12 + a.ion-speakerphone(title="Free Code Camp's Blog", href='http://blog.freecodecamp.com', target='_blank') + |   + a.ion-social-twitch-outline(title="Free Code Camp Live Pair Programming on Twitch.TV", href="http://www.twitch.tv/freecodecamp", target='_blank') + |   + a.ion-social-github(title="Free Code Camp on GitHub", href="http://github.com/freecodecamp", target='_blank') + |   + a.ion-social-twitter(title="Free Code Camp on Twitter", href="http://twitter.com/freecodecamp", target='_blank') + |   + a.ion-social-facebook(title="Free Code Camp on Facebook", href="http://facebook.com/freecodecamp", target='_blank') + |   + a.ion-social-linkedin(title="Free Code Camp on LinkedIn", href="http://linkedin.com/company/4831032?free-code-camp", target='_blank') + |   + a.ion-information-circled(title="About Free Code Camp", href="/learn-to-code") + |   + a.ion-locked(title="Free Code Camp's Privacy Policy", href="/privacy") + |   + a.ion-code-working(title="Bonfire Coding Playground", href="/playground") \ No newline at end of file From 1f36c262649e59c2878c32d855a0569c4b20b406 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 4 Feb 2015 16:11:48 -0800 Subject: [PATCH 4/5] minor changes to landing page --- views/home.jade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/views/home.jade b/views/home.jade index 6fcec23b5d..206cfd7811 100644 --- a/views/home.jade +++ b/views/home.jade @@ -69,9 +69,10 @@ block content .landing-skill-icon.ion-ios-loop-strong h2.black-text Agile br + br .big-break h2 Why you should join our community right now: - h3.col-xs-offset-0.col-sm-offset-1.col-md-offset-2 + h3.col-xs-offset-0.col-sm-offset-1 ul.text-left li.ion-code   We're thousands of professionals, all learning to code together li.ion-code   We're building projects for dozens of nonprofits @@ -81,6 +82,6 @@ block content li.ion-code   You'll learn to code at your own pace, in your browser or on your phone li.ion-code   You'll become qualified for thousands of jobs currently going unfilled li.ion-code   You can get help in real time from our community chat rooms and forum - li.ion-code   We all share one goal: to boost our careers with code + li.ion-code   We all share one common goal: to boost our careers with code .big-break a.btn.btn-cta.signup-btn(href="/login") Learn to code today (it's free) \ No newline at end of file From 829ace0365687abb0d5f368478e9e8fe0614c3aa Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 4 Feb 2015 16:42:54 -0800 Subject: [PATCH 5/5] fix a strange edge case on public portfolio pages --- views/account/show.jade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/views/account/show.jade b/views/account/show.jade index 36a8122d3d..2f4d8648a1 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -11,7 +11,10 @@ block content if picture img.img-center.img-responsive.public-profile-img(src=picture) else - img.img-center.img-responsive.public-profile-img(src='#{user.gravatar(200)}') + if (user) + img.img-center.img-responsive.public-profile-img(src='#{user.gravatar(200)}') + else + img.img-center.img-responsive.public-profile-img(src='https://gravatar.com/avatar/d704cc72a5cd0bfa482ee71f4d557daa?s=200&d=retro') h1.text-center.negative-5 - if (twitterHandle) a.ion-social-twitter.text-primary(title="@#{username}'s Twitter Profile", href="http://twitter.com/#{twitterHandle}", target='_blank')