diff --git a/public/css/lib/bootstrap/navbar.less b/public/css/lib/bootstrap/navbar.less index 30a79d4a43..7a0753c175 100755 --- a/public/css/lib/bootstrap/navbar.less +++ b/public/css/lib/bootstrap/navbar.less @@ -214,6 +214,7 @@ width: 22px; height: 2px; border-radius: 1px; + background-color: #eeeeee !important; } .icon-bar + .icon-bar { margin-top: 4px; diff --git a/public/css/lib/bootstrap/variables.less b/public/css/lib/bootstrap/variables.less index 652b6a7afe..e6d916a76a 100755 --- a/public/css/lib/bootstrap/variables.less +++ b/public/css/lib/bootstrap/variables.less @@ -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; diff --git a/public/css/main.less b/public/css/main.less index ef2cd8de74..9032e526f3 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -359,4 +359,7 @@ thead { color: #eee; font-size: 20px; margin-top: -5px; +} +.navbar-toggle { + color: #eee; } \ No newline at end of file diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 74b5e2d97b..e8ca00f27d 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -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') [ #{user.points} ] - 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') [ #{user.points} ] + 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)}') \ No newline at end of file + a(href='/profile') + img.profile-picture.float-right(src='#{user.gravatar(60)}') \ No newline at end of file