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

navbar looks right and hamburger works

Browse Source
This commit is contained in:
Michael Q Larson
2014-12-30 11:40:37 -08:00
parent cb7ff19564
commit c8d2be67c7
4 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/css/lib/bootstrap/navbar.less
View File

@ -214,6 +214,7 @@
width: 22px;
height: 2px;
border-radius: 1px;
background-color: #eeeeee !important;
}
.icon-bar + .icon-bar {
margin-top: 4px;

8
public/css/lib/bootstrap/variables.less
View File

@ -359,10 +359,10 @@
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
// Navbar links
@navbar-default-link-color: #777;
@navbar-default-link-hover-color: #333;
@navbar-default-link-hover-bg: transparent;
@navbar-default-link-active-color: #555;
@navbar-default-link-color: #eee;
@navbar-default-link-hover-color: #4a2b0f;
@navbar-default-link-hover-bg: #eee;
@navbar-default-link-active-color: #eee;
@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
@navbar-default-link-disabled-color: #ccc;
@navbar-default-link-disabled-bg: transparent;

3
public/css/main.less
View File

@ -359,4 +359,7 @@ thead {
color: #eee;
font-size: 20px;
margin-top: -5px;
}
.navbar-toggle {
color: #eee;
}

72
views/partials/navbar.jade
View File

@ -1,35 +1,43 @@
nav.navbar.navbar-fixed-top
.container
.navbar-header
a.navbar-brand(href='/')
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg')
#navbar
ul.nav.navbar-nav.navbar-right.visible-md.visible-lg
nav.navbar.navbar-default.navbar-fixed-top.nav-height
.container
.navbar-header
if user
button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
span.sr-only Toggle navigation
span.icon-bar
span.icon-bar
span.icon-bar
a.navbar-brand(href='/')
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg')
.collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right
if !user
a.btn.btn-primary.btn-nav.btn-sm(href='/login') Sign in
li
a(href='/') Challenges
- if (cc && cc[1] < 1)
li
a(href='/') Challenges
- if (cc && cc[1] < 1)
li
a(href='/challenges/1') Chat
- else
li
a(href='http://chat.freecodecamp.com') Chat
- if (cc && cc[2] < 1)
li
a(href='/challenges/2') Forum
- else
li
a(href='http://forum.freecodecamp.com') Forum
a(href='/challenges/1') Chat
- else
li
a(href='/learn-to-code') About
if user
li
a(href='/profile') [&nbsp;#{user.points}&nbsp;]
if !user
a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in
a(href='http://chat.freecodecamp.com') Chat
- if (cc && cc[2] < 1)
li
a(href='/challenges/2') Forum
- else
li
a(href='http://forum.freecodecamp.com') Forum
li
a(href='/learn-to-code') About
if user
li
a(href='/profile') [&nbsp;#{user.points}&nbsp;]
if !user
a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in
else
if user.profile.picture
a(href='/profile')
img.profile-picture.float-right(src='#{user.profile.picture}')
else
if user.profile.picture
a(href='/profile')
img.profile-picture.float-right(src='#{user.profile.picture}')
else
a(href='/profile')
img.profile-picture.float-right(src='#{user.gravatar(60)}')
a(href='/profile')
img.profile-picture.float-right(src='#{user.gravatar(60)}')