CodeCow/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-06-16 21:06:35 +08:00
Code Issues Actions 6 Packages 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
commit cf44287d7a
2 changed files with 3 additions and 2 deletions
Show Stats 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
.background-svg.img-center
.points-on-top
= "[ " + points + " ]"
= "[ " + user.progressTimestamps.length + " ]"
.row

3
views/partials/navbar.jade
View File

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