navbar looks right at full width

public/css/main.less

@@ -33,12 +33,13 @@ body {
   margin-bottom: 75px;
 }
 
-footer {
+.footer {
-  position: absolute;
-  bottom: 0;
   width: 100%;
-  height: 45px;
+  margin-bottom: 0px;
-  line-height: 45px;
+  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 {
+.navbar-nav > li > a {
-  color: #fff;
+  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;
 }

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(){

views/partials/footer.jade

@@ -1,21 +1,23 @@
-.visible-xs.visible-sm
+.footer.nav.navbar.navbar-nav.visible-xs.visible-sm
-    nav.navbar.navbar-bottom.nav.navbar-nav
+    ul
-        ul.text-center
+        li
+            a(href='/') Challenges
+        - if (cc && cc[1] < 1)
             li
-                a(href='/') Challenges
+                a(href='/challenges/1') Chat
-            - if (cc && cc[1] < 1)
+        - else
-                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
+                a(href='http://chat.freecodecamp.com') Chat
+        - if (cc && cc[2] < 1)
             li
-                a(href='/account') Account
+                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

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
+            a(href='/learn-to-code') About
-          li
+          if user
-            a(href='/account') Account
+            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
-              img.profile-picture.float-right(src='#{user.profile.picture}')
+              a(href='/profile')
-              | [ #{user.points} ]
+                img.profile-picture.float-right(src='#{user.profile.picture}')
             else
-              img.profile-picture.float-right(src='#{user.gravatar(60)}')
+              a(href='/profile')
-              | [ #{user.points} ]
+                img.profile-picture.float-right(src='#{user.gravatar(60)}')