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

Merge branch 'upstream/15718' into backup/master

Browse Source
This commit is contained in:
Berkeley Martinez
2017-08-08 18:15:20 -07:00
parent 9f820cd343 8637b9bd87
commit 74473a71bb
2 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
client/less/map.less
View File

@ -82,12 +82,12 @@
margin-top: -30px; margin-top: -30px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px; font-size: 14px;
} }
@media only screen and (min-width: 200px) and (max-width: 479px) { @media only screen and (min-width: 200px) and (max-width: 479px) {
margin-top: -30px; margin-top: -30px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 12px; font-size: 12px;
} }
} }
hr { hr {
margin:30px 0; margin:30px 0;
@ -97,10 +97,10 @@
} }
@media only screen and (min-width: 480px) and (max-width: 670px) { @media only screen and (min-width: 480px) and (max-width: 670px) {
margin: 15px 0; margin: 15px 0;
} }
@media only screen and (min-width: 200px) and (max-width: 479px) { @media only screen and (min-width: 200px) and (max-width: 479px) {
margin: 10px 0; margin: 10px 0;
} }
} }
.flashMessage { .flashMessage {
position:fixed; position:fixed;
@ -223,7 +223,7 @@
} }
div > div:last-child { div > div:last-child {
margin-bottom:30px margin-bottom:30px
} }
} }
.challengeBlockTime { .challengeBlockTime {
font-size: 18px; font-size: 18px;
@ -288,16 +288,16 @@
.input-group { .input-group {
margin-top: 0; margin-top: 0;
width: 100%; width: 100%;
} }
} }
.map-buttons:first-of-type { .map-buttons:first-of-type {
float: right; float: right;
padding-left: 10px; padding-left: 10px;
} }
hr { hr {
clear: both; clear: both;
margin: 9px 0; margin: 9px 0;
} }
} }
.map-accordion { .map-accordion {
top: 136px; top: 136px;
@ -314,8 +314,8 @@
margin-top: 10px; margin-top: 10px;
} }
} }
} }
@media only screen and (min-width: 200px) and (max-width: 479px) { @media only screen and (min-width: 200px) and (max-width: 479px) {
.map-fixed-header { .map-fixed-header {
.row.map-buttons { .row.map-buttons {
width: 100%; width: 100%;
@ -328,8 +328,8 @@
.input-group { .input-group {
margin-top: 0; margin-top: 0;
width: 100%; width: 100%;
} }
} }
} }
.map-accordion { .map-accordion {
@ -338,16 +338,16 @@
margin: 10px 0; margin: 10px 0;
a { a {
font-size: 18px; font-size: 18px;
} }
} }
h3 > a { h3 > a {
font-size: 17px; font-size: 17px;
} }
h3:first-child { h3:first-child {
margin-top: 10px; margin-top: 10px;
} }
} }
} }
.map-aside-action-item { .map-aside-action-item {
display: -webkit-flex; display: -webkit-flex;
@ -438,7 +438,7 @@
padding: 10px 0; padding: 10px 0;
padding-left: 50px; padding-left: 50px;
padding-right: 20px; padding-right: 20px;
font-size: 20px; font-size: 20px;
} }
} }
h3 > a { h3 > a {
@ -483,3 +483,20 @@
color: @night-text-color; color: @night-text-color;
} }
} }
.osfg-container {
display: flex;
flex-wrap: wrap;
padding: 35px;
}
.osfg-item {
&:before {
margin-right: 15px;
}
width: 32.3%;
@media (max-width: @screen-xs-max) {
width: 45%;
}
@media (max-width: @screen-xs) {
width: 100%;
}
}

45
server/views/map/show.jade
View File

@ -71,30 +71,31 @@ block content
a(data-toggle='collapse', data-parent='#accordion', href='#collapse-full-stack-development-certification') a(data-toggle='collapse', data-parent='#accordion', href='#collapse-full-stack-development-certification')
span.no-link-underline span.no-link-underline
i.fa.fa-caret-down   i.fa.fa-caret-down  
| Full Stack Development Certification | Open Source for Good
div.margin-left-10(id = 'collapse-full-stack-development-certification' class = "collapse in map-collapse no-transition certBlock") div.margin-left-10(id = 'collapse-full-stack-development-certification' class = "collapse in map-collapse no-transition certBlock")
#nested #nested
h3 a(data-toggle='collapse', data-parent='#nested', href='#nested-collapse-nonprofit-projects')
a(data-toggle='collapse', data-parent='#nested', href='#nested-collapse-nonprofit-projects') div
span.no-link-underline .challengeBlockDescription Once you feel ready, you can get real-world experience by contributing to these open source tools used by nonprofits.
i.fa.fa-caret-down   .osfg-container
| Nonprofit Projects p.challenge-title.text-primary.fa.fa-envelope-o.osfg-item(name="Mail for Good")
span.challengeBlockTime (800 hours) a(href="https://github.com/FreeCodeCamp/mail-for-good" target="_blank")
div.margin-left-10(id = "nested-collapse-nonprofit-projects" class = "collapse in map-collapse no-transition chapterBlock") span Mail for Good
.challengeBlockDescription To qualify for these nonprofit projects, you must first earn all three foundational certifications: Front End, Data Visualization, and Back End p.challenge-title.text-primary.fa.fa-cutlery.osfg-item(name="Pantry for Good")
p.challenge-title.disabled.text-primary.ion-locked.padded-ionic-icon.negative-15(name="Greenfield Nonprofit Project #1") Greenfield Nonprofit Project #1 a(href="https://github.com/FreeCodeCamp/pantry-for-good" target="_blank")
span.text-primary     span Pantry for Good
strong * p.challenge-title.text-primary.fa.fa-globe.osfg-item(name="Meeting for Good")
p.challenge-title.disabled.text-primary.ion-locked.padded-ionic-icon.negative-15(name="Greenfield Nonprofit Project #2") Greenfield Nonprofit Project #2 a(href="https://github.com/FreeCodeCamp/meeting-for-good" target="_blank")
span.text-primary     span Meeting for Good
strong * p.challenge-title.text-primary.fa.fa-futbol-o.osfg-item(name="League for Good")
p.challenge-title.disabled.text-primary.ion-locked.padded-ionic-icon.negative-15(name="Legacy Code Nonprofit Project #1") Legacy Code Nonprofit Project #1 a(href="https://github.com/FreeCodeCamp/league-for-good" target="_blank")
span.text-primary     span League for Good
strong * p.challenge-title.text-primary.fa.fa-users.osfg-item(name="Conference for Good")
p.challenge-title.disabled.text-primary.ion-locked.padded-ionic-icon.negative-15(name="Legacy Code Nonprofit Project #2") Legacy Code Nonprofit Project #2 a(href="https://github.com/FreeCodeCamp/conference-for-good" target="_blank")
span.text-primary     span Conference for Good
strong * p.challenge-title.text-primary.fa.fa-heart.osfg-item(name="freeCodeCamp")
p.challenge-title.disabled.text-primary.ion-locked.padded-ionic-icon.negative-15(name="Claim your Full Stack Development Certification") Claim your Full Stack Development Certification a(href="https://github.com/FreeCodeCamp/freecodecamp" target="_blank")
span freeCodeCamp
h2 h2
a(data-toggle='collapse', data-parent='#accordion', href='#collapse-coding-interview-preparation') a(data-toggle='collapse', data-parent='#accordion', href='#collapse-coding-interview-preparation')
span.no-link-underline span.no-link-underline