From a5f6735a280c8bbcc5f1f095eaa586ccb4620099 Mon Sep 17 00:00:00 2001
From: Kanwei Li <kanwei@gmail.com>
Date: Mon, 25 Jul 2011 20:55:42 -0400
Subject: [PATCH] Cleaner fix for 5828:e34b1108f7f8

---
 static/june_2007_style/blue/panel_layout.css | 1 -
 static/june_2007_style/blue/trackster.css    | 2 +-
 static/june_2007_style/panel_layout.css.tmpl | 8 --------
 templates/base_panels.mako                   | 7 +++++++
 templates/tool_form.mako                     | 8 +++-----
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/static/june_2007_style/blue/panel_layout.css b/static/june_2007_style/blue/panel_layout.css
index 041cb68830e..978cb7e224d 100644
--- a/static/june_2007_style/blue/panel_layout.css
+++ b/static/june_2007_style/blue/panel_layout.css
@@ -1,4 +1,3 @@
-body,html{overflow:hidden;margin:0;padding:0;width:100%;height:100%;}
 body{font:75% "Lucida Grande",verdana,arial,helvetica,sans-serif;background:#eee;}
 .unselectable{user-select:none;-moz-user-select:none;-webkit-user-select:none;}
 #background{position:absolute;background:#eee;z-index:-1;top:0;left:0;margin:0;padding:0;width:100%;height:100%;}
diff --git a/static/june_2007_style/blue/trackster.css b/static/june_2007_style/blue/trackster.css
index 5899b0974b1..2b48c276507 100644
--- a/static/june_2007_style/blue/trackster.css
+++ b/static/june_2007_style/blue/trackster.css
@@ -55,4 +55,4 @@ input{font:10px verdana;}
 .icon.more-down{background:url('../images/fugue/arrow-transition-270-bw.png') no-repeat 0px 0px;}
 .icon.more-across{background:url('../images/fugue/arrow-transition-bw.png') no-repeat 0px 0px;}
 .intro{padding:1em;}
-.intro>.action-button{background-color:#CCC;padding:1em;}
\ No newline at end of file
+.intro > .action-button{background-color:#CCC;padding:1em;}
diff --git a/static/june_2007_style/panel_layout.css.tmpl b/static/june_2007_style/panel_layout.css.tmpl
index 3e0ed581ca8..ac0e59188e6 100644
--- a/static/june_2007_style/panel_layout.css.tmpl
+++ b/static/june_2007_style/panel_layout.css.tmpl
@@ -1,11 +1,3 @@
-body, html {
-    overflow: hidden;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-    height: 100%;
-}
-
 body {
     font: 75% "Lucida Grande",verdana,arial,helvetica,sans-serif; 
     background: ${layout_bg};
diff --git a/templates/base_panels.mako b/templates/base_panels.mako
index c9c70257c22..ccd2021c52b 100644
--- a/templates/base_panels.mako
+++ b/templates/base_panels.mako
@@ -19,6 +19,13 @@
 <%def name="stylesheets()">
     ${h.css('base','panel_layout','jquery.rating')}
     <style type="text/css">
+    body, html {
+        overflow: hidden;
+        margin: 0;
+        padding: 0;
+        width: 100%;
+        height: 100%;
+    }
     #center {
         %if not self.has_left_panel:
             left: 0;
diff --git a/templates/tool_form.mako b/templates/tool_form.mako
index 9ce53913c74..5581b7458d1 100644
--- a/templates/tool_form.mako
+++ b/templates/tool_form.mako
@@ -2,12 +2,10 @@
 <%namespace file="/base_panels.mako" import="overlay" />
 
 <%def name="stylesheets()">
-    ${h.css( "autocomplete_tagging", "panel_layout", "base", "library" )}
+    ${h.css( "autocomplete_tagging", "base", "panel_layout", "library" )}
     <style type="text/css">
-        body, html {
-            overflow: auto;
-            width: auto;
-            height: auto;
+        html, body {
+            background-color: #fff;
         }
     </style>
 </%def>