From d6020beebb31d7cabbc2d711c284d2e94989392a Mon Sep 17 00:00:00 2001
From: Sahat Yalkabov <sakhat@gmail.com>
Date: Fri, 7 Mar 2014 14:02:38 -0500
Subject: [PATCH] Updated footer

---
 public/css/styles.less         |  9 ++++++---
 public/css/themes/default.less | 10 ++--------
 public/css/themes/flatly.less  |  6 ------
 views/layout.jade              |  3 ++-
 views/partials/footer.jade     | 26 +++++++++++---------------
 5 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/public/css/styles.less b/public/css/styles.less
index 3c7e30b009..dc6d23cb1d 100644
--- a/public/css/styles.less
+++ b/public/css/styles.less
@@ -20,14 +20,17 @@ body {
   height: auto !important;
   height: 100%;
   /* Negative indent footer by its height */
-  margin: 0 auto -110px;
+  margin: 0 auto -100px;
   /* Pad bottom by footer height + (optional) extra spacing */
   padding: 0 0 140px;
 }
 
 #footer {
-  height: 110px;
-  padding-top: 15px;
+  font-size: 12px;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  height: 100px;
+  border-top: 1px solid #eee;
 }
 
 // Navbar
diff --git a/public/css/themes/default.less b/public/css/themes/default.less
index edd3d2af41..66a4a83323 100644
--- a/public/css/themes/default.less
+++ b/public/css/themes/default.less
@@ -1,3 +1,5 @@
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,400,600,300,700,800);
+
 // Brand Colors
 // -------------------------
 
@@ -79,11 +81,3 @@
 .navbar-default .navbar-nav > li a {
   transition: color 0.3s;
 }
-
-// Footer
-// -------------------------
-
-#footer {
-  background-color: @navbar-default-bg;
-  border-top: 1px solid @navbar-default-border;
-}
\ No newline at end of file
diff --git a/public/css/themes/flatly.less b/public/css/themes/flatly.less
index 794d2fe7ae..76d4d3d31e 100644
--- a/public/css/themes/flatly.less
+++ b/public/css/themes/flatly.less
@@ -2,12 +2,6 @@
 // Variables
 // --------------------------------------------------
 
-#footer {
-  color: #fff;
-  background-color: @navbar-default-bg;
-  border-top: 1px solid @navbar-default-border;
-}
-
 //== Colors
 //
 //## Gray and brand colors for use across Bootstrap.
diff --git a/views/layout.jade b/views/layout.jade
index 68af862967..e4eb858ab5 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -15,4 +15,5 @@ html
       .container
         include partials/flash
         block content
-    include partials/footer
+    .container
+      include partials/footer
diff --git a/views/partials/footer.jade b/views/partials/footer.jade
index 224fd3c2d2..f380e32a5b 100644
--- a/views/partials/footer.jade
+++ b/views/partials/footer.jade
@@ -1,17 +1,13 @@
 #footer
-  .container.text-center
-    div
-      | © 2014 Company, Inc.
-    div
-      strong Hackathon Starter
-      |  Project
-      |  ·
-      | Created by
-      a(href='http://sahatyalkabov.com')  Sahat Yalkabov
-    div
-      | Code licensed under
-      a(href='http://opensource.org/licenses/mit-license.html')  MIT License
-    div
+  ul.list-inline.pull-left
+    li © 2014 Company, Inc.
+    li
+      a(href='#') Terms of Use
+    li
+      a(href='#') Privacy Policy
+    li
       a(href='https://github.com/sahat/hackathon-starter') GitHub Project
-      |  ·
-      a(href='https://github.com/sahat/hackathon-starter/issues')  Issues
+    li
+      a(href='https://github.com/sahat/hackathon-starter/issues') Issues
+  ul.list-inline.pull-right
+