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

Challenge numbering in Map fixed to work properly on IE.

Browse Source
This commit is contained in:
JelenaBarinova
2015-12-08 11:46:35 -08:00
parent eb740482ec
commit 96375bb643
2 changed files with 103 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/less/main.less
View File

@ -231,6 +231,12 @@ ul {
font-size: 20px; font-size: 20px;
} }
.map-row-numbers {
text-align: right;
padding-right: 5px;
padding-left: 5px;
}
.link-table td{ .link-table td{
font-size: 16px; font-size: 16px;
border-top: none !important; border-top: none !important;

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

@ -45,63 +45,77 @@ block content
.row .row
.col-xs-12.col-sm-8.col-sm-offset-2 .col-xs-12.col-sm-8.col-sm-offset-2
h3 800 Hours of Practice: h3 800 Hours of Practice:
ol - var i = 0
for challengeBlock in blocks for challengeBlock in blocks
.row - i++
if (user) .row
if (challengeBlock.completed === 100) if (user)
.hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10 if (challengeBlock.completed === 100)
.col-xs-12.col-sm-9.col-md-10 .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10
li.map-p.faded.negative-10 .col-xs-1.col-sm-1.col-md-1.map-row-numbers
a(href='#' + challengeBlock.dashedName)= challengeBlock.name span.map-p.negative-10 #{i}.
if challengeBlock.markNew .col-xs-11.col-sm-8.col-md-9
span.text-danger.small     span.map-p.faded.negative-10
strong
em NEW
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-12.col-sm-9.col-md-10
li.map-p.negative-10
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
if challengeBlock.markNew
span.text-danger.small    
strong
em NEW
else
.hidden-xs.col-sm-3.col-md-2
span.negative-10
.col-xs-12.col-sm-9.col-md-10
li.map-p.negative-10
a(href='#' + challengeBlock.dashedName)= challengeBlock.name a(href='#' + challengeBlock.dashedName)= challengeBlock.name
if challengeBlock.markNew if challengeBlock.markNew
span.text-danger.small     span.text-danger.small    
strong strong
em NEW em NEW
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
span.map-p.negative-10 #{i}.
.col-xs-11.col-sm-8.col-md-9
span.map-p.negative-10
a(href='#' + challengeBlock.dashedName)= challengeBlock.name
if challengeBlock.markNew
span.text-danger.small    
strong
em NEW
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-danger.small    
strong
em NEW
.row .row
.col-xs-12.col-sm-8.col-sm-offset-2.negative-28 .col-xs-12.col-sm-8.col-sm-offset-2
h3 800 Hours of   h3 800 Hours of  
a(href="/nonprofits/directory") Real World Work Experience a(href="/nonprofits/directory") Real World Work Experience
| : | :
ol - var i = 0
.row .row
.hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 .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 .col-xs-1.col-sm-1.col-md-1.map-row-numbers
li.map-p.negative-10 100-hour Nonprofit Project span.map-p.negative-10 #{++i}.
.row .col-xs-10.col-sm-8.col-md-9
.hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 span.map-p.negative-10 100-hour Nonprofit Project
.col-xs-12.col-sm-9.col-md-10 .row
li.map-p.negative-10 200-hour Nonprofit Project #1 .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10
.row .col-xs-1.col-sm-1.col-md-1.map-row-numbers
.hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 span.map-p.negative-10 #{++i}.
.col-xs-12.col-sm-9.col-md-10 .col-xs-10.col-sm-8.col-md-9
li.map-p.negative-10 200-hour Nonprofit Project #2 span.map-p.negative-10 200-hour Nonprofit Project #1
.row .row
.hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.map-p.negative-10 .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 .col-xs-1.col-sm-1.col-md-1.map-row-numbers
li.map-p.negative-10 300-hour Nonprofit Project span.map-p.negative-10 #{++i}.
.col-xs-10.col-sm-8.col-md-9
span.map-p.negative-10 200-hour Nonprofit Project #2
.row
.hidden-xs.col-sm-3.col-md-2.ion-locked.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.map-p.negative-10 300-hour Nonprofit Project
hr hr
for challengeBlock in blocks for challengeBlock in blocks
@ -118,41 +132,44 @@ block content
h3 #{challengeBlock.name}   h3 #{challengeBlock.name}  
.row - var i = 0
ol for challenge in challengeBlock.challenges
for challenge in challengeBlock.challenges - i++
if challenge.completed .row
.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 .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10
.col-xs-12.col-sm-9.col-md-10 .col-xs-1.col-sm-1.col-md-1.map-row-numbers
li.faded.map-p.negative-10 span.map-p.negative-10 #{i}.
a(href="/challenges/#{challenge.dashedName}") .col-xs-10.col-sm-8.col-md-9
span.capitalize= challenge.type + ': ' span.faded.map-p.negative-10
span= challenge.title a(href="/challenges/#{challenge.dashedName}")
span.sr-only= " Complete" span.capitalize= challenge.type + ': '
span= challenge.title
span.sr-only= " Complete"
else else
.row .hidden-xs.col-sm-3.col-md-2
.hidden-xs.col-sm-3.col-md-2 span.negative-10
span.negative-10 .col-xs-1.col-sm-1.col-md-1.map-row-numbers
.col-xs-12.col-sm-9.col-md-10 span.map-p.negative-10 #{i}.
li.map-p.negative-10 .col-xs-10.col-sm-8.col-md-9
a(href="/challenges/#{challenge.dashedName}") span.map-p.negative-10
span.capitalize= challenge.type + ': ' 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= " Incomplete"
span.text-danger.small     if challenge.markNew
strong span.text-danger.small    
em NEW strong
em NEW
if (challengeBlock.completed === 100) if (challengeBlock.completed === 100)
.button-spacer .button-spacer
.row .row
.col-xs-12.col-sm-8.col-md-6.col-sm-offset-3.col-md-offset-2.hidden .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. 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}") .hidden(id="#{challengeBlock.name}")
script. script.
var username = !{JSON.stringify(user && user.username || '')}; var username = !{JSON.stringify(user && user.username || '')};
var lastCompleted = !{JSON.stringify(lastCompleted || false)} var lastCompleted = !{JSON.stringify(lastCompleted || false)}
@ -168,4 +185,4 @@ block content
}, 1000); }, 1000);
localStorage.hideRedditNotice = "true"; localStorage.hideRedditNotice = "true";
}); });
}); });