diff --git a/client/less/lib/bootstrap/variables.less b/client/less/lib/bootstrap/variables.less index 968b70b7c6d..98b46a105fe 100755 --- a/client/less/lib/bootstrap/variables.less +++ b/client/less/lib/bootstrap/variables.less @@ -14,9 +14,9 @@ @gray-light: lighten(@gray-base, 46.7%); // #777 @gray-lighter: lighten(@gray-base, 93.5%); // #eee -@brand-primary: #215f1e; -@brand-success: #457E86; -@brand-info: #4A2B0F; +@brand-primary: #407521; +@brand-success: #457e86; +@brand-info: #2b414f; @brand-warning: #f0ad4e; @brand-danger: #d9534f; @@ -26,7 +26,7 @@ //## Settings for some of the most global styles. //** Background color for ``. -@body-bg: #eee; +@body-bg: #ffffff; //** Global text color on ``. @text-color: @gray-dark; diff --git a/client/less/main.less b/client/less/main.less index 48b37e4045f..0fa05e522a5 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -56,7 +56,7 @@ html { } body.full-screen-body-background { - background-color: @gray-lighter; + background-color: @body-bg; } @@ -290,7 +290,7 @@ ul { margin-right: 10px; white-space: nowrap; } - background-color: #215f1e; + background-color: @brand-primary; text-align: center; } .navbar { @@ -332,13 +332,13 @@ ul { } .navbar { - background-color: #215f1e; + background-color: @brand-primary; } .navbar-nav > li > a { - color: @gray-lighter; + color: @body-bg; &:hover { - color: #215f1e; + color: @brand-primary; } } @@ -429,13 +429,13 @@ thead { } .navbar-nav a { - color: @gray-lighter; + color: @body-bg; font-size: 20px; margin-top: -5px; margin-bottom: -5px; } .navbar-toggle { - color: @gray-lighter; + color: @body-bg; } .signup-btn-nav { @@ -475,7 +475,7 @@ thead { } .points-on-top { - color: @gray-lighter; + color: @body-bg; font-size: 35px; z-index: 2; width: 60%; @@ -487,7 +487,7 @@ thead { } .landing-skill-icon { - color: #215f1e; + color: @brand-primary; font-size: 150px; } @@ -564,7 +564,7 @@ thead { } .challenge-list-header { - background-color: #215f1e; + background-color: @brand-primary; color: @gray-lighter; font-size: 36px; text-align: center; @@ -583,7 +583,7 @@ thead { width: 100%; height: 50px; text-align: center; - background-color: #215f1e; + background-color: @brand-primary; padding: 12px; bottom: 0; left: 0; @@ -598,7 +598,7 @@ thead { padding-top: 14px; padding-bottom: 12px; &:hover { - color: #215f1e; + color: @brand-primary; background-color: @gray-lighter; text-decoration: none; } @@ -923,7 +923,7 @@ hr { } .cal-heatmap-container { - background-color: @gray-lighter; + background-color: @body-bg; } .interested-camper-image { diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx index 676cd8790ae..a21215c73bb 100644 --- a/common/app/routes/Jobs/components/Jobs.jsx +++ b/common/app/routes/Jobs/components/Jobs.jsx @@ -65,7 +65,6 @@ export default contain( } = this.props; return ( - - ); } }) diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade index 9f7b3929e56..c03bec4de1c 100644 --- a/server/views/challengeMap/show.jade +++ b/server/views/challengeMap/show.jade @@ -1,199 +1,34 @@ -extends ../layout +extends ../layout-wide block content - h1.text-center Challenge Map - hr - if (Math.random() > 0.999) - img.img-responsive.img-center.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner-dino.png') - audio(autoplay src='https://s3.amazonaws.com/freecodecamp/t-rex-roar.mp3') - else - img.img-responsive.img-center.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png') - .col-xs-12.col-md-8.col-md-offset-2 - h2 - table.population-table.img-center - tr - td Established:  - td - span.text-primary #{daysRunning}  - | days ago - tr - td Population:    - td - span.text-primary #{camperCount}  - | campers - tr - td Completed:    - td - span.text-primary #{globalCompletedCount}  - | challenges - - - - .spacer - if (user && user.progressTimestamps.length > 100) - .row - #map-notice.col-xs-12.col-md-8.col-md-offset-2.hidden - h2.text-center Reddit or not, here we come - img.thumbnail.img-center.img-responsive(src="http://i.imgur.com/lyd0bfM.jpg") - h4.text-center Come ask questions and share your thoughts with our entire open source community on our subreddit. - a.button.btn.btn-block.btn-primary(href="https://reddit.com/r/freecodecamp" target="_blank") Check it out - .button-spacer - .text-center - a#hide-map-notice-button(href='#') Hide this forever - .spacer - - ul - for superBlock in superBlocks - h2= superBlock.name - - var i = 0 - for challengeBlock in superBlock.blocks - - i++ - .row - if (user) - if (challengeBlock.completed === 100) - .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-1.col-sm-1.col-md-1.map-row-numbers.negative-5 - span.map-p.negative-10 #{i}. - .col-xs-11.col-sm-8.col-md-9 - li.map-p.faded.negative-10 - a(href='#' + challengeBlock.dashedName)= challengeBlock.name - if challengeBlock.markNew - span.text-info.small     - strong - em NEW - if challengeBlock.isComingSoon - span.text-info.small     - strong - em Coming Soon - else - .hidden-xs.col-sm-3.col-md-2 - .progress.progress-bar-padding.text-center.thin-progress-bar - .progress-bar(role='progressbar', aria-valuenow=(challengeBlock.completed), aria-valuemin='0', aria-valuemax='100', style='width: ' + challengeBlock.completed + '%;') - .col-xs-1.col-sm-1.col-md-1.map-row-numbers.negative-5 - span.map-p #{i}. - .col-xs-11.col-sm-8.col-md-9 - li.map-p.negative-10 - a(href='#' + challengeBlock.dashedName)= challengeBlock.name - if challengeBlock.markNew - span.text-info.small     - strong - em NEW - if challengeBlock.isComingSoon - span.text-info.small     - strong - em Coming Soon - else - .hidden-xs.col-sm-3.col-md-2 - .col-xs-1.col-sm-1.col-md-1.map-row-numbers - span.map-p.negative-10 #{i}. - .col-xs-10.col-sm-8.col-md-9 - span.map-p.negative-10 - a(href='#' + challengeBlock.dashedName)= challengeBlock.name - if challengeBlock.markNew - span.text-info.small     - strong - em NEW - if challengeBlock.isComingSoon - span.text-info.small     - strong - em Coming Soon - h2 Full Stack Development Certification - .row - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Greenfield Nonprofit Project 1 - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Greenfield Nonprofit Project 2 - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Legacy Nonprofit Project 1 - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Legacy Nonprofit Project 2 - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Claim your Full Stack Development Certification - - h2 Coding Interview Preparation - .row - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Whiteboard Coding Interview Training - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Critical Thinking Interview Training - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Mock Interview 1 - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Mock Interview 2 - .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-12.col-sm-9.col-md-10 - li.map-p.negative-10 Mock Interview 3 - - hr - - for superBlock, index in superBlocks - for challengeBlock in superBlock.blocks - .row - a(href='#' name=challengeBlock.dashedName) - .spacer.negative-55 - - .row - .hidden-xs.col-sm-3.col-md-2 - h3.text-primary.text-right.nowrap - i.fa.fa-clock-o - = challengeBlock.time - .col-xs-12.col-sm-9.col-md-10 - h3 #{challengeBlock.name}   - - - var i = 0 + .col-xs-12.col-sm-3.col-sm-offset-9 + for superBlock, index in superBlocks + for challengeBlock in superBlock.blocks + h4.bold #{challengeBlock.name} (#{challengeBlock.time}) for challenge in challengeBlock.challenges - - i++ - .row - if challenge.completed - .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10 - .col-xs-1.col-sm-1.col-md-1.map-row-numbers - span.map-p.negative-10 #{i}. - .col-xs-10.col-sm-8.col-md-9 - span.faded.map-p.negative-10 - a(href="/challenges/#{challenge.dashedName}") - span.capitalize= challenge.type + ': ' - span= challenge.title - span.sr-only= " Complete" - - else - .hidden-xs.col-sm-3.col-md-2 - span.negative-10 - .col-xs-1.col-sm-1.col-md-1.map-row-numbers - span.map-p.negative-10 #{i}. - .col-xs-10.col-sm-8.col-md-9 - span.map-p.negative-10 - a(href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '') - span.capitalize= challenge.type + ': ' - span= challenge.title - span.sr-only= " Incomplete" - if challenge.markNew - span.text-info.small     - strong - em NEW - if challengeBlock.isComingSoon - span.text-info.small     - strong - em Coming Soon - - if (challengeBlock.completed === 100) - .button-spacer - .row - .col-xs-12.col-sm-8.col-md-6.col-sm-offset-3.col-md-offset-2.hidden - a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your code portfolio with your friends. - .hidden(id="#{challengeBlock.name}") - - if (index < superBlocks.length - 1) - .spacer - hr - .spacer + if challenge.completed + p.text-primary.ion-checkmark-circled.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   + a(href="/challenges/#{challenge.dashedName}") + = challenge.title + span.sr-only= " Complete" + else + p.negative-15 + a(name="#{challenge.dashedName}" href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '') + span= challenge.title + span.sr-only= " Incomplete" + if challenge.markNew + span.text-success.small     + strong + em New + if challengeBlock.isComingSoon + span.text-success.small     + strong + em Coming Soon + if challenge.type === "bonfire" + span.text-info.small     + strong + em Required + if (index < superBlocks.length) + hr script. var username = !{JSON.stringify(user && user.username || '')}; diff --git a/server/views/home.jade b/server/views/home.jade index 197683a0414..0c80370c87b 100644 --- a/server/views/home.jade +++ b/server/views/home.jade @@ -5,16 +5,16 @@ block content .spacer .row .col-xs-12.col-sm-12.col-md-3 - img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='Get great references and connections to start your software engineer career') + img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg', alt='Get great references and connections to start your software engineer career') p.large-p Join a community of 100,000+ developers. .col-xs-12.col-sm-12.col-md-3 - img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg.gz', alt='Learn to code and learn full stack JavaScript') + img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg', alt='Learn to code and learn full stack JavaScript') p.large-p Work together on coding challenges. .col-xs-12.col-sm-12.col-md-3 - img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_portfolio.svg.gz', alt='Build a portfolio of apps for nonprofits') + img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_portfolio.svg', alt='Build a portfolio of apps for nonprofits') p.large-p Build a portfolio of apps that solve real problems. .col-xs-12.col-sm-12.col-md-3 - img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg.gz', alt='Help empower nonprofits with code') + img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg', alt='Help empower nonprofits with code') p.large-p Empowering nonprofits with code. .big-break .row