From cb7ff19564c8cab6411965bfcfc16454742d6b1d Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Tue, 30 Dec 2014 10:45:19 -0800
Subject: [PATCH] navbar looks right at full width

---
 public/css/main.less       | 19 ++++++++++---------
 views/layout.jade          |  2 --
 views/partials/footer.jade | 38 ++++++++++++++++++++------------------
 views/partials/navbar.jade | 15 ++++++++-------
 4 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/public/css/main.less b/public/css/main.less
index 514c851394..ef2cd8de74 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 {
@@ -255,10 +256,10 @@ ul {
   background-color: #4a2b0f;
 }
 
-.navbar-default .navbar-nav > li > a {
-  color: #fff;
+.navbar-nav > li > a {
+  color: #eee;
   &:hover {
-    color: #ddd;
+    color: #4a2b0f;
   }
 }
 
@@ -355,7 +356,7 @@ thead {
 }
 
 .navbar-nav a {
-  color: #ddd;
+  color: #eee;
   font-size: 20px;
   margin-top: -5px;
 }
\ No newline at end of file
diff --git a/views/layout.jade b/views/layout.jade
index 19aa6b5d82..38d29b19fd 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -17,8 +17,6 @@ html
     .container
       include partials/flash
       block content
-
-      include partials/footer
   != js('application')
 script.
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/views/partials/footer.jade b/views/partials/footer.jade
index 5d69bec195..99193726ad 100644
--- a/views/partials/footer.jade
+++ b/views/partials/footer.jade
@@ -1,21 +1,23 @@
-.visible-xs.visible-sm
-    nav.navbar.navbar-bottom.nav.navbar-nav
-        ul.text-center
+.footer.nav.navbar.navbar-nav.visible-xs.visible-sm
+    ul
+        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') Buzz
+                a(href='http://chat.freecodecamp.com') Chat
+        - if (cc && cc[2] < 1)
             li
-                a(href='/account') Account
\ No newline at end of file
+                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
\ No newline at end of file
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index 8f0f6cd30f..74b5e2d97b 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -20,15 +20,16 @@ nav.navbar.navbar-fixed-top
             li
               a(href='http://forum.freecodecamp.com') Forum
           li
-            a(href='/learn-to-code') Buzz
-          li
-            a(href='/account') Account
+            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
-              img.profile-picture.float-right(src='#{user.profile.picture}')
-              | [&nbsp;#{user.points}&nbsp;]
+              a(href='/profile')
+                img.profile-picture.float-right(src='#{user.profile.picture}')
             else
-              img.profile-picture.float-right(src='#{user.gravatar(60)}')
-              | [&nbsp;#{user.points}&nbsp;]
+              a(href='/profile')
+                img.profile-picture.float-right(src='#{user.gravatar(60)}')
\ No newline at end of file