From f00f93fc7c7510fcf31802cc183421d2a342af0f Mon Sep 17 00:00:00 2001
From: Matt Claypotch <thepotch@gmail.com>
Date: Thu, 6 Oct 2011 10:58:44 -0700
Subject: [PATCH] Revert "the footer should stick to the bottom of tall pages
 (bug 685738)"

This reverts commit 64f360d7e4bba6c25e0475b723dd7aaed7c7a688.
---
 media/css/impala/footer.less |  4 ----
 media/css/impala/site.less   | 18 +++++-------------
 templates/impala/base.html   |  3 ++-
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/media/css/impala/footer.less b/media/css/impala/footer.less
index 3c909afa72..0cc5e83b0e 100644
--- a/media/css/impala/footer.less
+++ b/media/css/impala/footer.less
@@ -23,10 +23,6 @@
         margin: 0 auto;
         position: relative;
     }
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
 }
 
 #footer-logo a,
diff --git a/media/css/impala/site.less b/media/css/impala/site.less
index bdb83e70d9..a380c521c2 100644
--- a/media/css/impala/site.less
+++ b/media/css/impala/site.less
@@ -1,6 +1,6 @@
 @import 'lib';
 
-html {
+html, body {
     height: 100%;
 }
 
@@ -9,8 +9,6 @@ html {
 }
 
 body {
-    min-height: 100%;
-    position: relative;
     border-top: 2px solid #686868;
 }
 
@@ -19,22 +17,16 @@ body {
     min-height: 100%;
     height: auto;
     width: 960px;
-    margin: 0 auto;
+    margin: 0 auto -123px;
     position: relative;
-    padding-bottom: 600px;
+    .bump {
+        min-height: 123px;
+    }
     > header h3 {
         margin-bottom: 16px;
     }
 }
 
-.thunderbird,
-.seamonkey,
-.sunbird {
-    #page {
-        padding-bottom: 336px;
-    }
-}
-
 a {
     text-decoration: none;
     color: @link;
diff --git a/templates/impala/base.html b/templates/impala/base.html
index 1edc038e83..e4d3fafcfb 100644
--- a/templates/impala/base.html
+++ b/templates/impala/base.html
@@ -57,7 +57,7 @@
         {% endif %}
         {% block bodyattrs %}{% endblock %}>
 
-    <div id="page" class="c">
+    <div id="page">
       {% block site_header %}
         {# Well that's an awful tiny mozilla header #}
         <div id="global-header-tab">
@@ -168,6 +168,7 @@
         {% block outer_content %}{% endblock %}
         {% block content %}{% endblock %}
       {% endblock %}
+      <div class="bump"></div>
     </div>
     <div id="tooltip">
       <span></span>