gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Quincy Larson
2016-01-10 23:49:09 -06:00
committed by Berkeley Martinez
parent 7f0be44f98
commit f410a94b54
5 changed files with 50 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/less/lib/bootstrap/variables.less
View File

@ -14,9 +14,9 @@
@gray-light: lighten(@gray-base, 46.7%); // #777 @gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee @gray-lighter: lighten(@gray-base, 93.5%); // #eee
@brand-primary: #215f1e; @brand-primary: #407521;
@brand-success: #457E86; @brand-success: #457e86;
@brand-info: #4A2B0F; @brand-info: #2b414f;
@brand-warning: #f0ad4e; @brand-warning: #f0ad4e;
@brand-danger: #d9534f; @brand-danger: #d9534f;
@ -26,7 +26,7 @@
//## Settings for some of the most global styles. //## Settings for some of the most global styles.
//** Background color for `<body>`. //** Background color for `<body>`.
@body-bg: #eee; @body-bg: #ffffff;
//** Global text color on `<body>`. //** Global text color on `<body>`.
@text-color: @gray-dark; @text-color: @gray-dark;

26
client/less/main.less
View File

@ -56,7 +56,7 @@ html {
} }
body.full-screen-body-background { body.full-screen-body-background {
background-color: @gray-lighter; background-color: @body-bg;
} }
@ -290,7 +290,7 @@ ul {
margin-right: 10px; margin-right: 10px;
white-space: nowrap; white-space: nowrap;
} }
background-color: #215f1e; background-color: @brand-primary;
text-align: center; text-align: center;
} }
.navbar { .navbar {
@ -332,13 +332,13 @@ ul {
} }
.navbar { .navbar {
background-color: #215f1e; background-color: @brand-primary;
} }
.navbar-nav > li > a { .navbar-nav > li > a {
color: @gray-lighter; color: @body-bg;
&:hover { &:hover {
color: #215f1e; color: @brand-primary;
} }
} }
@ -429,13 +429,13 @@ thead {
} }
.navbar-nav a { .navbar-nav a {
color: @gray-lighter; color: @body-bg;
font-size: 20px; font-size: 20px;
margin-top: -5px; margin-top: -5px;
margin-bottom: -5px; margin-bottom: -5px;
} }
.navbar-toggle { .navbar-toggle {
color: @gray-lighter; color: @body-bg;
} }
.signup-btn-nav { .signup-btn-nav {
@ -475,7 +475,7 @@ thead {
} }
.points-on-top { .points-on-top {
color: @gray-lighter; color: @body-bg;
font-size: 35px; font-size: 35px;
z-index: 2; z-index: 2;
width: 60%; width: 60%;
@ -487,7 +487,7 @@ thead {
} }
.landing-skill-icon { .landing-skill-icon {
color: #215f1e; color: @brand-primary;
font-size: 150px; font-size: 150px;
} }
@ -564,7 +564,7 @@ thead {
} }
.challenge-list-header { .challenge-list-header {
background-color: #215f1e; background-color: @brand-primary;
color: @gray-lighter; color: @gray-lighter;
font-size: 36px; font-size: 36px;
text-align: center; text-align: center;
@ -583,7 +583,7 @@ thead {
width: 100%; width: 100%;
height: 50px; height: 50px;
text-align: center; text-align: center;
background-color: #215f1e; background-color: @brand-primary;
padding: 12px; padding: 12px;
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -598,7 +598,7 @@ thead {
padding-top: 14px; padding-top: 14px;
padding-bottom: 12px; padding-bottom: 12px;
&:hover { &:hover {
color: #215f1e; color: @brand-primary;
background-color: @gray-lighter; background-color: @gray-lighter;
text-decoration: none; text-decoration: none;
} }
@ -923,7 +923,7 @@ hr {
} }
.cal-heatmap-container { .cal-heatmap-container {
background-color: @gray-lighter; background-color: @body-bg;
} }
.interested-camper-image { .interested-camper-image {

2
common/app/routes/Jobs/components/Jobs.jsx
View File

@ -65,7 +65,6 @@ export default contain(
} = this.props; } = this.props;
return ( return (
<Panel>
<Row> <Row>
<Col <Col
md={ 10 } md={ 10 }
@ -127,7 +126,6 @@ export default contain(
</Row> </Row>
</Col> </Col>
</Row> </Row>
</Panel>
); );
} }
}) })

223
server/views/challengeMap/show.jade
View File

@ -1,199 +1,34 @@
extends ../layout extends ../layout-wide
block content block content
h1.text-center Challenge Map .col-xs-12.col-sm-3.col-sm-offset-9
hr for superBlock, index in superBlocks
if (Math.random() > 0.999) for challengeBlock in superBlock.blocks
img.img-responsive.img-center.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner-dino.png') h4.bold #{challengeBlock.name} (#{challengeBlock.time})
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:&thinsp;
td
span.text-primary #{daysRunning}&thinsp;
| days ago
tr
td Population:&thinsp;&thinsp;&thinsp;
td
span.text-primary #{camperCount}&thinsp;
| campers
tr
td Completed:&thinsp;&thinsp;&thinsp;
td
span.text-primary #{globalCompletedCount}&thinsp;
| 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 &thinsp; &thinsp;
strong
em NEW
if challengeBlock.isComingSoon
span.text-info.small &thinsp; &thinsp;
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 &thinsp; &thinsp;
strong
em NEW
if challengeBlock.isComingSoon
span.text-info.small &thinsp; &thinsp;
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 &thinsp; &thinsp;
strong
em NEW
if challengeBlock.isComingSoon
span.text-info.small &thinsp; &thinsp;
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} &thinsp;
- var i = 0
for challenge in challengeBlock.challenges for challenge in challengeBlock.challenges
- i++ if challenge.completed
.row p.text-primary.ion-checkmark-circled.padded-ionic-icon.negative-15(name="#{challenge.dashedName}") &nbsp;
if challenge.completed a(href="/challenges/#{challenge.dashedName}")
.hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10 = challenge.title
.col-xs-1.col-sm-1.col-md-1.map-row-numbers span.sr-only= " Complete"
span.map-p.negative-10 #{i}. else
.col-xs-10.col-sm-8.col-md-9 p.negative-15
span.faded.map-p.negative-10 a(name="#{challenge.dashedName}" href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '')
a(href="/challenges/#{challenge.dashedName}") span= challenge.title
span.capitalize= challenge.type + ': ' span.sr-only= " Incomplete"
span= challenge.title if challenge.markNew
span.sr-only= " Complete" span.text-success.small &thinsp; &thinsp;
strong
else em New
.hidden-xs.col-sm-3.col-md-2 if challengeBlock.isComingSoon
span.negative-10 span.text-success.small &thinsp; &thinsp;
.col-xs-1.col-sm-1.col-md-1.map-row-numbers strong
span.map-p.negative-10 #{i}. em Coming Soon
.col-xs-10.col-sm-8.col-md-9 if challenge.type === "bonfire"
span.map-p.negative-10 span.text-info.small &thinsp; &thinsp;
a(href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '') strong
span.capitalize= challenge.type + ': ' em Required
span= challenge.title if (index < superBlocks.length)
span.sr-only= " Incomplete" hr
if challenge.markNew
span.text-info.small &thinsp; &thinsp;
strong
em NEW
if challengeBlock.isComingSoon
span.text-info.small &thinsp; &thinsp;
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
script. script.
var username = !{JSON.stringify(user && user.username || '')}; var username = !{JSON.stringify(user && user.username || '')};

8
server/views/home.jade
View File

@ -5,16 +5,16 @@ block content
.spacer .spacer
.row .row
.col-xs-12.col-sm-12.col-md-3 .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. p.large-p Join a community of 100,000+ developers.
.col-xs-12.col-sm-12.col-md-3 .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. p.large-p Work together on coding challenges.
.col-xs-12.col-sm-12.col-md-3 .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. p.large-p Build a portfolio of apps that solve real problems.
.col-xs-12.col-sm-12.col-md-3 .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. p.large-p Empowering nonprofits with code.
.big-break .big-break
.row .row