From 0e8b4ab37db72b99811f5fdcfcff989331e30050 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Fri, 13 Oct 2006 08:53:12 +0000
Subject: [PATCH] Ooops, this is the second part of commit 10683. Fix visual
 glitch which caused the right group being displayed below the left group, and
 then moved by js to the right place. Now the only visible thing is  the
 touching borders being removed and the boxes height being balanced. Remove
 conditional "clear" tag since it's possible to get the same behaviour in pure
 css.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10684 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_xhtml_style/erp5.css.xml        | 11 +++++++++--
 .../portal_skins/erp5_xhtml_style/erp5.js.xml         |  3 +++
 product/ERP5/bootstrap/erp5_xhtml_style/bt/revision   |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
index 01ca1db1f6..6b095e3db8 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
@@ -564,6 +564,13 @@ div.index_html table {\n
 \n
 div.top_group,\n
 fieldset.left,\n
+fieldset.center,\n
+fieldset.bottom {\n
+  clear: both;\n
+}\n
+\n
+div.top_group,\n
+fieldset.left,\n
 fieldset.right,\n
 fieldset.center,\n
 fieldset.bottom {\n
@@ -585,13 +592,13 @@ fieldset.center {\n
 fieldset.left {\n
   width: 50%;\n
   float: left;\n
-  margin-right: -11px; /* 5px margin *2 + 1px for left border width */\n
+  margin-right: -12px; /* 5px margin *2 + 2px for left & right border width */\n
 }\n
 \n
 fieldset.right {\n
   width: 50%;\n
   float: left;\n
-  margin-left: -11px; /* 5px margin *2 + 1px for right border width */\n
+  margin-left: -12px; /* 5px margin *2 + 2px for left & right border width */\n
 }\n
 \n
 div.top_group fieldset.left,\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
index ee6d66b645..a5197e0b64 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
@@ -90,6 +90,9 @@ function fixLeftRightHeight(){\n
     rfieldset.style.height = (lh>rh)? lh+"px" : rh+"px";\n
     lfieldset.style.borderRightWidth = 0;\n
     rfieldset.style.borderLeftWidth = 0;\n
+    /* XXX: hardcoded values required unless there is a way to compute "12px"-"1px" in js */\n
+    lfieldset.style.marginRight = "-11px";\n
+    rfieldset.style.marginLeft = "-11px";\n
   }\n
 }\n
 
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 63fe24a5cd..ace9d03621 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-253
+255
-- 
2.30.9