Footer fixed.

3 files changed, 10 insertions, 15 deletions

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 61220de..d04e9a4 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -9,18 +9,14 @@ body {
 
 footer{
   background-color: $blue;
-  /*bottom: 0;*/
-  /*position: absolute;*/
-  /*width: 100%;*/
-  padding: 20px 20px;
+  bottom: 0;
+  width: 100%;
+  padding: 20px 0 220px;
+  text-align: center;
 
   .content{
     color: white;
-    margin: 0 auto;
-    margin-bottom: 220px;
-    text-align: center;
-    border: 1px solid magenta;
-
+    .row { margin: 0 auto; }
     a{
       color: white;
       &:hover{ text-decoration: underline; }
diff --git a/app/assets/stylesheets/media-queries.css.scss b/app/assets/stylesheets/media-queries.css.scss
index 6e51629..3dfbeb7 100644
--- a/app/assets/stylesheets/media-queries.css.scss
+++ b/app/assets/stylesheets/media-queries.css.scss
@@ -1,7 +1,6 @@
 /* Large desktop */
 @media (min-width: 1200px) {
-
-  /*740px;*/
+  .container { min-height: 600px; }
 }
 
 /* Portrait tablet to landscape and desktop */
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 67222a0..b742eca 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -26,14 +26,14 @@
               <%= yield %>
             </div>
           </div>
-          <footer>
-          </footer>
         </div>
       </div> <!--! end of .container -->
     </div> <!--! end of #main -->
     <footer>
-      <div class="content span12">
-        <%= link_to "Privacy Policy" %> &copy; 2013 Parley, Inc. All rights reserved.
+      <div class="content">
+          <div class="row">
+            <%= link_to "Privacy Policy" %> &copy; 2013 Parley, Inc. All rights reserved.
+          </div>
       </div>
     </footer>
   <%= javascript_include_tag :application %>