diff --git a/public/css/main.less b/public/css/main.less index a24bef9717..514c851394 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -54,15 +54,6 @@ h1, h2, h3, h4, h5, h6, p, li { padding-bottom: 5px; } -// Navbar -// ------------------------- - -.navbar-nav img { - width: 30px; - height: 30px; - margin: -15px 15px -15px; -} - // Alerts // ------------------------- @@ -95,11 +86,6 @@ h1, h2, h3, h4, h5, h6, p, li { height: 100px; } -.navbar-icon { - height: 40px; - margin-top: -10px; -} - /**/ .btn-cta { @@ -354,12 +340,6 @@ thead { font-size: 150%; } -.hamburger { - background-color: #ddd; - text-align: left; - font-size: 20px; -} - .nowrap { white-space: nowrap; } @@ -367,4 +347,15 @@ thead { .big-break { margin-top: 30px; margin-bottom: 30px; +} + +.profile-picture { + height: 50px; + width: 50px; +} + +.navbar-nav a { + color: #ddd; + font-size: 20px; + margin-top: -5px; } \ No newline at end of file diff --git a/views/account/profile.jade b/views/account/profile.jade index d3f92678d2..8feb21e437 100644 --- a/views/account/profile.jade +++ b/views/account/profile.jade @@ -33,8 +33,13 @@ block content span.ion-edit | Update my profile .panel + .big-break .container.text-center - a.btn.btn-cta.signup-btn.big-break(href='/') Take me to my current challenge + a.btn.btn-cta.signup-btn(href='/') Take me to my current challenge + .big-break + .container.text-center + a.btn.btn-default.btn-big(href='/logout') Sign out + .big-break - if (!user.google || !user.facebook || !user.github || !user.linkedin || !user.twitter) .panel diff --git a/views/layout.jade b/views/layout.jade index eeb151f5eb..19aa6b5d82 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -18,7 +18,8 @@ html include partials/flash block content - != js('application') + include partials/footer + != js('application') script. (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), @@ -27,4 +28,4 @@ script. ga('create', 'UA-55446531-1', 'auto'); ga('require', 'displayfeatures'); ga('send', 'pageview'); -script(src="//cdn.optimizely.com/js/999692993.js") +script(src="//cdn.optimizely.com/js/999692993.js") \ No newline at end of file diff --git a/views/partials/footer.jade b/views/partials/footer.jade index e69de29bb2..5d69bec195 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -0,0 +1,21 @@ +.visible-xs.visible-sm + nav.navbar.navbar-bottom.nav.navbar-nav + ul.text-center + 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 + li + a(href='/learn-to-code') Buzz + li + a(href='/account') Account \ No newline at end of file diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 699744b4b5..8f0f6cd30f 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -1,57 +1,34 @@ -.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.signup-btn.btn-nav.btn-sm(href='/login') Sign in - else - li.dropdown(class=title=='Account Management'?'active':undefined) - a.dropdown-toggle.text-center(href='#', data-toggle='dropdown') - if user.profile.picture - img(src='#{user.profile.picture}') - else - img(src='#{user.gravatar(60)}') - | #{user.profile.name || user.email || user.id} [ #{user.points} ] - i.caret - ul.dropdown-menu.text-right - li.hamburger - a(href='/') - span.ion-map - | My Challenges - - if (cc && cc[1] < 1) - li.hamburger.disabled - a(href='https://gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank') - span.ion-coffee - | Chat Room (do Challenge 1 first) - - else - li.hamburger - a(href='https://gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank') - span.ion-coffee - | Chat Room - - if (cc && cc[2] < 1) - li.hamburger.disabled - a(href='http://forum.freecodecamp.com/', target='_blank') - span.ion-planet - | Forum (do Challenge 2 first) - - else - li.hamburger - a(href='http://forum.freecodecamp.com/', target='_blank') - span.ion-planet - | Forum - li.hamburger - a(href='/account') - span.ion-person - | My Account - li.hamburger - a(href='/logout') - span.ion-log-out - | Logout \ No newline at end of file +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 + 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 + li + a(href='/learn-to-code') Buzz + li + a(href='/account') Account + if !user + a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in + else + if user.profile.picture + img.profile-picture.float-right(src='#{user.profile.picture}') + | [ #{user.points} ] + else + img.profile-picture.float-right(src='#{user.gravatar(60)}') + | [ #{user.points} ]