From c343db12e2a3f2637e1df540992d5085bb47c3a0 Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Thu, 27 Sep 2007 22:11:16 +0000
Subject: [PATCH] Yet more fucking lame-o CSS changes.

---
 static/css/ie6.css   | 36 ++++++++++++++++++++++++++++++++----
 static/css/ie7.css   | 16 ++++++++++++----
 static/css/style.css | 26 ++++++++++++++++++--------
 view/Main_page.py    | 16 ++++++++++------
 4 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/static/css/ie6.css b/static/css/ie6.css
index f3e70ce..d8f6e00 100644
--- a/static/css/ie6.css
+++ b/static/css/ie6.css
@@ -4,8 +4,13 @@
 
 #toolbar {
   position: absolute;
+  float: none;
+  width: auto;
   top: expression( eval( document.compatMode && document.compatMode == 'CSS1Compat' ) ? documentElement.scrollTop + 20 : document.body.scrollTop + 20 );
-  margin-left: -6em;
+  margin-left:expression( 
+    document.body.clientWidth < ( 900 / 12 ) * 
+    parseInt( document.body.currentStyle.fontSize ) ?  "-4em": "0em"
+  );
 }
 
 #status_area {
@@ -19,13 +24,36 @@
   top: 0em;
 }
 
-#center_area {
+#everything_area {
   width:expression( 
-    document.body.clientWidth > ( 1250 / 12 ) * 
-    parseInt( document.body.currentStyle.fontSize ) ?  "45em": "60%"
+    document.body.clientWidth < ( 1300 / 12 ) * 
+    parseInt( document.body.currentStyle.fontSize ) ?  "100%": "78em"
   );
 }
 
+#toolbar_area {
+  width:expression( 
+    document.body.clientWidth < ( 1300 / 12 ) * 
+    parseInt( document.body.currentStyle.fontSize ) ?  "18%": "15em"
+  );
+}
+
+#center_area {
+  float: right;
+  width:expression( 
+    document.body.clientWidth < ( 1300 / 12 ) * 
+    parseInt( document.body.currentStyle.fontSize ) ?  "60%": "45em"
+  );
+}
+
+#link_area {
+  width:expression( 
+    document.body.clientWidth < ( 1300 / 12 ) * 
+    parseInt( document.body.currentStyle.fontSize ) ?  "17%": "15em"
+  );
+  margin-left: 1.5em;
+}
+
 .pulldown {
   height: expression( this.scrollHeight > 200 ? "200px" : "auto" );
   width: expression( this.scrollHeight > 200 ? "12em" : "auto" );
diff --git a/static/css/ie7.css b/static/css/ie7.css
index c9afcef..4f41b25 100644
--- a/static/css/ie7.css
+++ b/static/css/ie7.css
@@ -1,9 +1,17 @@
-#toolbar {
-  margin-left: -6em;
-}
-
 #content {
   position: absolute;
   left: 0em;
   top: 0em;
 }
+
+#center_area {
+  float: right;
+}
+
+#toolbar {
+  margin-left: -1em;
+}
+
+#link_area {
+  margin-left: 1.5em;
+}
diff --git a/static/css/style.css b/static/css/style.css
index 159dbd8..dc0069a 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -32,13 +32,23 @@ ol li {
 #everything_area {
   margin: 0 auto;
   text-align: center;
+  width: 78em;
+  max-width: 100%;
+}
+
+#toolbar_area {
+  float: left;
+  width: 15em;
+  max-width: 18%;
 }
 
 #toolbar {
+  float: left;
+  width: 15em;
+  max-width: 18%;
   position: fixed;
+  text-align: right;
   margin-top: 5em;
-  left: 20%;
-  margin-left: -4em;
   z-index: 1;
 }
 
@@ -95,13 +105,13 @@ ol li {
 }
 
 #link_area {
-  position: absolute;
+  float: right;
   text-align: left;
-  left: 80%;
-  margin-left: 1.5em;
   margin-top: 1em;
-  margin-right: 2em;
+  margin-right: 1em;
   line-height: 100%;
+  width: 15em;
+  max-width: 17%;
 }
 
 #link_area h4 {
@@ -112,8 +122,8 @@ ol li {
 #center_area {
   margin: 0 auto;
   text-align: center;
-  width: 60%;
-  max-width: 45em;
+  width: 45em;
+  max-width: 60%;
 }
 
 #status_area {
diff --git a/view/Main_page.py b/view/Main_page.py
index 60c5223..1545adf 100644
--- a/view/Main_page.py
+++ b/view/Main_page.py
@@ -1,6 +1,6 @@
 from cgi import escape
 from Page import Page
-from Tags import Input, Div, Noscript, H2, H4, A
+from Tags import Input, Div, Noscript, H2, H4, A, Br
 from Search_form import Search_form
 from Link_area import Link_area
 from Toolbar import Toolbar
@@ -22,12 +22,16 @@ class Main_page( Page ):
       Div(
         id = u"status_area",
       ),
-      Toolbar(),
-      Div(
-        Link_area( notebook_id ),
-        id = u"link_area",
-      ),
       Div(
+        Div(
+          Br(),
+          Toolbar(),
+          id = u"toolbar_area",
+        ),
+        Div(
+          Link_area( notebook_id ),
+          id = u"link_area",
+        ),
         Div(
           Div(
             Div(