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

Merge branch 'fix/mobile_portfolio_view' of https://github.com/kema00/FreeCodeCamp into kema00-fix/mobile_portfolio_view

Browse Source
This commit is contained in:
Quincy Larson
2015-11-13 16:59:10 -08:00
parent fc615ad3dd f14009833c
commit 6bfaa5e9ef
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/views/account/show.jade
View File

@ -76,8 +76,8 @@ block content
// | Add them to my personal leaderboard // | Add them to my personal leaderboard
.spacer .spacer
.hidden-xs.hidden-sm.col-md-12 .col-md-12
#cal-heatmap.d3-centered #cal-heatmap.hidden-xs.hidden-sm.d3-centered
script. script.
$(document).ready(function () { $(document).ready(function () {
var estUTCOffset = -5; var estUTCOffset = -5;
@ -128,47 +128,55 @@ block content
thead thead
tr tr
th.col-xs-4 Project th.col-xs-4 Project
th.col-xs-2 Completed th.col-xs-2.hidden-xs Completed
th.col-xs-6 Link th.col-xs-6.hidden-xs Link
for challenge in baseAndZip for challenge in baseAndZip
tr tr
td.col-xs-4 td.col-xs-4.hidden-xs
a(href='/challenges/' + challenge.name, target='_blank')= challenge.name a(href='/challenges/' + challenge.name, target='_blank')= challenge.name
td.col-xs-2= moment(challenge.completedDate, 'x').format("MMM DD, YYYY") td.col-xs-2.hidden-xs= moment(challenge.completedDate, 'x').format("MMM DD, YYYY")
td.col-xs-6 td.col-xs-6.hidden-xs
a(href=challenge.solution, target='_blank') View my project a(href=challenge.solution, target='_blank') View my project
td.col-xs-12.visible-xs
a(href=challenge.solution, target='_blank')=challenge.name
if (bonfires.length > 0) if (bonfires.length > 0)
.col-sm-12 .col-sm-12
table.table.table-striped table.table.table-striped
thead thead
tr tr
th.col-xs-4 Bonfire th.col-xs-4 Bonfire
th.col-xs-2 Completed th.col-xs-2.hidden-xs Completed
th.col-xs-6 Solution th.col-xs-6.hidden-xs Solution
for bonfire in bonfires for bonfire in bonfires
tr tr
td.col-xs-4= bonfire.name td.col-xs-4.hidden-xs= bonfire.name
td.col-xs-2= moment(bonfire.completedDate, 'x').format("MMM DD, YYYY") td.col-xs-2.hidden-xs= moment(bonfire.completedDate, 'x').format("MMM DD, YYYY")
td.col-xs-6 td.col-xs-6.hidden-xs
a(href='/challenges/' + bonfire.name + '?solution=' + encodeURIComponent(replaceScriptTags(bonfire.solution)), target='_blank') View my solution a(href='/challenges/' + bonfire.name + '?solution=' + encodeURIComponent(replaceScriptTags(bonfire.solution)), target='_blank') View my solution
td.col-xs-12.visible-xs
a(href='/challenges/' + bonfire.name + '?solution=' + encodeURIComponent(replaceScriptTags(bonfire.solution)), target='_blank')= bonfire.name
if (waypoints.length > 0) if (waypoints.length > 0)
.col-sm-12 .col-sm-12
table.table.table-striped table.table.table-striped
thead thead
tr tr
th.col-xs-4 Waypoints th.col-xs-4 Waypoints
th.col-xs-2 Completed th.col-xs-2.hidden-xs Completed
th.col-xs-6 Solution th.col-xs-6.hidden-xs Solution
for challenge in waypoints for challenge in waypoints
tr tr
td.col-xs-4= challenge.name td.col-xs-4.hidden-xs= challenge.name
td.col-xs-2= moment(challenge.completedDate, 'x').format("MMM DD, YYYY") td.col-xs-2.hidden-xs= moment(challenge.completedDate, 'x').format("MMM DD, YYYY")
td.col-xs-6 td.col-xs-6.hidden-xs
if (challenge.solution) if (challenge.solution)
a(href='/challenges/' + challenge.name + '?solution=' + encodeURIComponent(replaceScriptTags(challenge.solution)), target='_blank') View my solution a(href='/challenges/' + challenge.name + '?solution=' + encodeURIComponent(replaceScriptTags(challenge.solution)), target='_blank') View my solution
else else
a(href='/challenges/' + challenge.name) View this challenge a(href='/challenges/' + challenge.name) View this challenge
td.col-xs-12.visible-xs
if (challenge.solution)
a(href='/challenges/' + challenge.name + '?solution=' + encodeURIComponent(replaceScriptTags(challenge.solution)), target='_blank')= challenge.name
else
a(href='/challenges/' + challenge.name)= challenge.name
if (user && user.username === username) if (user && user.username === username)
.panel.panel-info .panel.panel-info
.panel-heading.text-center Manage your account .panel-heading.text-center Manage your account