Merge pull request #4200 from FreeCodeCamp/fix/update-landing

Fix landing and nonprofits page

server/resources/testimonials.json

@@ -4,7 +4,7 @@
     "quote": "By building a robust and highly functional web app I was able to not only increase my confidence but was able to show potential employers what I was able to create. Both were huge for me and led me to getting a fantastic job.",
     "github": "MetaCoderHirschl",
     "linkedin": "https://www.linkedin.com/profile/view?id=ADEAAAKX2fEBfeZ1GVdOh-c0zzkYZKw38o8qzow",
-    "image": "http://i.imgur.com/58XvKfe.jpg"
+    "image": "http://i.imgur.com/nsvNixW.jpg"
   },
   {
     "camper": "Branden Byers",
@@ -57,7 +57,7 @@
   },
   {
     "camper": "Brian Grant",
-    "quote": "I've received new employment opportunities and I have not even finished Free Code Camp's first 800 hours of training yet.",
+    "quote": "Free Code Camp's a great way for disabled veterans like me to retrain. I'm receiving engineering job offers, and I haven't even finished yet.",
     "github": "codeseekingman",
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAEUqXoBFOq1SWQrBsTMHG4ij9Ss4Qqnrtg",
     "image": "http://i.imgur.com/QPpjPac.jpg"

server/views/home.jade

@@ -37,17 +37,17 @@ block content
             .spacer
             .row
                 .col-xs-12.col-sm-12.col-md-4
-                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/xzDoJef.jpg", alt="Ashley's testimonial image")
+                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/nsvNixW.jpg", alt="Meta's testimonial image")
-                    p.testimonial-copy Free Code Camp helped me get my first engineering job. This amazing community made my career switch a lot easier and more fun.
+                    p.testimonial-copy Through Free Code Camp, I built a robust and highly functional web app for a nonprofit. This led me to getting a fantastic job.
-                    h3 - Ashley Drake
+                    h3 - Meta Hirschl
+                .col-xs-12.col-sm-12.col-md-4
+                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/QPpjPac.jpg", alt="Brian's testimonial image")
+                    p.testimonial-copy Free Code Camp's a great way for disabled veterans like me to retrain. I'm receiving engineering job offers, and I haven't even finished yet.
+                    h3 - Brian Grant
                 .col-xs-12.col-sm-12.col-md-4
                     img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/wjlDigg.jpg", alt="Maxim Orlov's testimonial image")
                     p.testimonial-copy I started Free Code Camp with zero knowledge of web development. 6 months later, I landed my first job as a back end engineer.
                     h3 - Maxim Orlov
-                .col-xs-12.col-sm-12.col-md-4
-                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/58XvKfe.jpg", alt="Meta's testimonial image")
-                    p.testimonial-copy Through Free Code Camp, I built a robust and highly functional web app for a nonprofit. This led me to getting a fantastic job.
-                    h3 - Meta Hirschl
             .spacer
             .row
                 .col-xs-12.col-sm-8.col-sm-offset-2
@@ -87,9 +87,9 @@ block content
             .spacer
             hr
             .spacer
+            .col-xs-offset-0.col-sm-offset-1.text-left
                 h2 Here's why you should join our open source community right now:
-            h3.col-xs-offset-0.col-sm-offset-1
+                ul.large-li
-                ul.text-left
                     li.ion-code   You'll get help in real time from our community chat rooms.
                     li.ion-code   You'll meet up with other coders in your city.
                     li.ion-code   You'll learn to code at your own pace, in your browser or on your phone.

server/views/resources/nonprofits.jade

@@ -4,12 +4,17 @@ block content
         .text-center
             .row
                 .col-xs-12
-                    h1.nonprofit-landing.hug-top Get pro bono code for your nonprofit
+                    h1.landing-heading Get pro bono code for your nonprofit.
                     .big-break
                     .col-xs-12.col-sm-12.col-md-12
                         .embed-responsive.embed-responsive-16by9
                             iframe.embed-responsive-item(src='//player.vimeo.com/video/126228100')
                         .big-break
+                    h2 As featured in:
+                    img.img-center.img-responsive(src='https://s3.amazonaws.com/freecodecamp/as-seen-on.png')
+                    .spacer
+                    hr
+                    .spacer
                     h2 Our process:
                     .row
                         .col-xs-12.col-sm-12.col-md-4
@@ -24,7 +29,9 @@ block content
                             h3.nowrap Your solution
                             img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='image of two people high-fiving')
                             p.landing-p Together we'll set milestones and complete your project.
-                    .big-break
+                    .spacer
+                    hr
+                    .spacer
                     h2 Solutions we can help you build:
                     .text-center.negative-35
                         .col-xs-12.col-sm-12.col-md-3
@@ -51,7 +58,20 @@ block content
                         .col-xs-12.col-sm-12.col-md-3
                             .landing-skill-icon.ion-settings
                             h2.black-text ...and other tools
+            .spacer
+            hr
+            .spacer
+            .large-p.text-left.col-xs-offset-0.col-sm-offset-1
+                h2 Our developers build projects for nonprofits who:
+                ul.large-li
+                    li.ion-code   already have people who benefit from their services.
+                    li.ion-code   are registered with their government and have tax-exempt status.
+                    li.ion-code   have a stakeholder who can meet with our developers to direct the project.
+                    li.ion-code   can budget at least $20 per month for their own cloud servers.
+                    li.ion-code   can commit to using and maintaining the solution that our developers build.
             .big-break
+            .row
+                .col-xs-12.col-sm-8.col-sm-offset-2
                     a.btn.btn-cta.signup-btn.btn-block(href="/nonprofits-form") My nonprofit needs coding help
                     .button-spacer
-            a.btn.btn-cta.btn-success.btn-block(href="/nonprofits/directory") Browse our directory of nonprofits we've helped
+                    a.btn.btn-lg.btn-primary.btn-primary-ghost.btn-block(href="/nonprofits/directory") Browse our directory of nonprofits we've helped

server/views/resources/stories.jade

@@ -15,15 +15,13 @@ block content
                                         |  
                                         a.fa.fa-linkedin-square.text-primary(alt="#{story.camper}'s LinkedIn Profile", href=story.linkedin, target='_blank')
                                     p.text-justify= story.quote
-
+                    .col-xs-12.col-sm-10.col-sm-offset-1
-
                             if moreStories
                                 .text-center
                                     a.btn.btn-lg.btn-primary.btn-primary-ghost.btn-block(href="/all-stories") Show more stories
                             .spacer
 
-
                             if !user
                                 .text-center
-                    a.btn.btn-cta.signup-btn(href="/login") Start learning to code (it's free)
+                                    a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free)
                             .spacer