greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6366 from FreeCodeCamp/fix/navbar-div-to-li 

Fix Navbar elements
pull/6371/head
Rex Schrader 2016-01-21 15:59:58 -08:00
parent 08fe041979 76bee1edec
commit 9052f6d547
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/less/main.less
View File

@ -279,7 +279,7 @@ ul {
.navbar-right {
@media (min-width: 767px) {
padding-right: 50px;
margin-right:0;
}
@media (max-width: 991px) and (min-width: 768px) {
position: absolute;
@ -300,6 +300,8 @@ ul {
}
}
li.avatar, li.avatar > a { padding:0; margin:0 }
.thin-progress-bar {
height: 8px;
margin-top: 3px;

4
server/views/partials/navbar.jade
View File

@ -29,6 +29,6 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
else
li.brownie-points-nav
a(href='/' + user.username) [ #{user.progressTimestamps.length} ]
.hidden-xs.hidden-sm
a(href='/' + user.username)
li.hidden-xs.hidden-sm.avatar
a(href='/' + user.username)
img.profile-picture.float-right(src='#{user.picture}')