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

resolve merge conflict in navbar

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-21 18:53:15 +09:00
parent ac511982a4 a89139119a
commit cf44287d7a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/account/show.jade
View File

@ -41,7 +41,7 @@ block content
.col-xs-12.col-sm-12.col-md-3.text-center .col-xs-12.col-sm-12.col-md-3.text-center
.background-svg.img-center .background-svg.img-center
.points-on-top .points-on-top
= "[ " + points + " ]" = "[ " + user.progressTimestamps.length + " ]"
.row .row

3
views/partials/navbar.jade
View File

@ -12,7 +12,7 @@
.collapse.navbar-collapse .collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right.hamburger-dropdown ul.nav.navbar-nav.navbar-right.hamburger-dropdown
li li
a(href='/challenges') Challenges a(href='/courseware') Challenges
li li
a(href='/chat') Chat a(href='/chat') Chat
li li
@ -26,6 +26,7 @@
else else
li li
if (user.profile.username) if (user.profile.username)
a(href='/' + user.profile.username) [ #{user.progressTimestamps.length} ] a(href='/' + user.profile.username) [ #{user.progressTimestamps.length} ]
else else