diff --git a/controllers/user.js b/controllers/user.js index a21f414527..db9791d7a3 100644 --- a/controllers/user.js +++ b/controllers/user.js @@ -141,8 +141,8 @@ exports.getAccount = function(req, res) { } res.render('account/profile', { title: 'Manage your Free Code Camp Account', - cc: c, - ch: req.user.challengesHash, + c: c, + cc: req.user.challengesHash, moment: moment }); }); 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 a24bef9717..8e3fda9af9 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -33,12 +33,13 @@ body { margin-bottom: 75px; } -footer { - position: absolute; - bottom: 0; +.footer { width: 100%; - height: 45px; - line-height: 45px; + margin-bottom: 0px; + text-align: center; + padding:0px; + height: 200px; + background-color: #4a2b0f; } h1, h2 { @@ -54,15 +55,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 +87,6 @@ h1, h2, h3, h4, h5, h6, p, li { height: 100px; } -.navbar-icon { - height: 40px; - margin-top: -10px; -} - /**/ .btn-cta { @@ -237,8 +224,18 @@ ul { } } +.navbar-right { + @media (min-width: 767px) { + padding-right: 50px; + } + @media (max-width: 991px) and (min-width: 767px) { + position: absolute; + right:0; + margin-right: 10px; + white-space: nowrap; + } +} .navbar { - height: 40px; white-space: nowrap; } @@ -250,10 +247,6 @@ ul { text-decoration: line-through; } -.dropdown-toggle { - margin-top: -5px; -} - .btn-social { width: 250px; margin: auto; @@ -269,10 +262,10 @@ ul { background-color: #4a2b0f; } -.navbar-default .navbar-nav > li > a { - color: #fff; +.navbar-nav > li > a { + color: #eee; &:hover { - color: #ddd; + color: #4a2b0f; } } @@ -295,7 +288,7 @@ ul { background-image: linear-gradient(#ffcc4d, #ffac33); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#ffac33, GradientType=0)"; border-color: #f1a02a; - color: #292f33; + color: #292f33 !important; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .signup-btn:hover, .signup-btn:focus { @@ -303,7 +296,7 @@ ul { background-image: linear-gradient(#ffcc4d, #e99110); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#e99110, GradientType=0)"; border-color: #ec8b11; - color: #292f33; + color: #292f33 !important; } .signup-btn:active { background-color: #f2a330; @@ -354,12 +347,6 @@ thead { font-size: 150%; } -.hamburger { - background-color: #ddd; - text-align: left; - font-size: 20px; -} - .nowrap { white-space: nowrap; } @@ -367,4 +354,30 @@ thead { .big-break { margin-top: 30px; margin-bottom: 30px; +} + +.profile-picture { + height: 50px; + width: 50px; +} + +.navbar-nav a { + color: #eee; + font-size: 20px; + margin-top: -5px; + margin-bottom: -5px; +} +.navbar-toggle { + color: #eee; +} + +.navbar-right { + background-color: #4a2b0f; + text-align: center; +} + +.signup-btn-nav { + margin-top:-2px !important; + padding-top: 10px !important; + padding-bottom: 10px !important; } \ No newline at end of file diff --git a/views/account/profile.jade b/views/account/profile.jade index d3f92678d2..d1f93bafb1 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 @@ -66,7 +71,7 @@ block content i.fa.fa-twitter | Link Twitter with your account br - - if (ch[0] > 0) + - if (cc[0] > 0) .panel .container h1 Completed Challenges @@ -76,11 +81,11 @@ block content tr th Challenge th Date Finished - for challenge in cc - if ch[challenge.challengeNumber] > 0 + for challenge in c + if cc[challenge.challengeNumber] > 0 tr - td= cc[challenge.challengeNumber].name - td= moment(ch[challenge.challengeNumber], 'X').format("MMM DD, YYYY") + td= c[challenge.challengeNumber].name + td= moment(cc[challenge.challengeNumber], 'X').format("MMM DD, YYYY") br .panel .container diff --git a/views/challenges/show.jade b/views/challenges/show.jade index 13251ef9c3..6afb19d44e 100644 --- a/views/challenges/show.jade +++ b/views/challenges/show.jade @@ -15,15 +15,6 @@ block content .btn.btn-primary.btn-big.btn-block.completed-challenge I've completed this challenge .ten-pixel-break .btn.btn-success.btn-large.btn-block.skip-challenge I want to skip this challenge for now - - if (points && points > 2 || !cc) - .panel-footer.text-center - span Need a break? Check out our:  - a(href="https://gitter.im/FreeCodeCamp/FreeCodeCamp", target="_blank") Chat Room - |  ,  - a(href="http://blog.freecodecamp.com", target="_blank") Blog - |  , or  - a(href="http://forum.freecodecamp.com", target="_blank") Forum - | . #complete-dialog.modal .modal-dialog.animated.zoomIn.fast-animation .modal-content diff --git a/views/home.jade b/views/home.jade index 8db1458d54..c0ed242ddd 100644 --- a/views/home.jade +++ b/views/home.jade @@ -3,7 +3,7 @@ block content .hidden-xs a(href='https://github.com/freecodecamp/freecodecamp') img(style='position: absolute; top: 40; right: 0; border: 0; margin-top: -10px;', src='https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67', alt='Fork me on GitHub', data-canonical-src='https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png') - .jumbotron.negative-15 + .jumbotron .text-center h1.hug-top Code with Us h2 Let's learn to code by building projects for nonprofits diff --git a/views/layout.jade b/views/layout.jade index eeb151f5eb..38d29b19fd 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -17,8 +17,7 @@ html .container include partials/flash block content - - != js('application') + != 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 +26,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..99193726ad 100644 --- a/views/partials/footer.jade +++ b/views/partials/footer.jade @@ -0,0 +1,23 @@ +.footer.nav.navbar.navbar-nav.visible-xs.visible-sm + ul + 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') About + if user + li + a(href='/profile') [ #{user.points} ] + if !user + a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in \ No newline at end of file diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 699744b4b5..4b25791991 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -1,57 +1,41 @@ -.navbar.navbar-default.navbar-fixed-top.nav-height +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 + 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 + li + a(href='/') Challenges + - if (!cc || (cc && cc[1]) < 1) + li + a(href='/challenges/1') Chat + - else + li + a(href='http://chat.freecodecamp.com' target='_blank') Chat + - if (!cc || (cc && cc[2]) < 1) + li + a(href='/challenges/2') Forum + - else + li + a(href='http://forum.freecodecamp.com' target='_blank') Forum + li + a(href='/about') About if !user - a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in + li + a.btn.signup-btn.signup-btn-nav(href='/login') Sign in else - li.dropdown(class=title=='Account Management'?'active':undefined) - a.dropdown-toggle.text-center(href='#', data-toggle='dropdown') + li + a(href='/account') [ #{user.points} ] + .hidden-xs 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 + img.profile-picture.float-right(src='#{user.profile.picture}') + else + a(href='/account') + img.profile-picture.float-right(src='#{user.gravatar(60)}') \ No newline at end of file