[Erp5-report] r10684 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Oct 13 10:53:12 2006
New Revision: 10684

URL: http://svn.erp5.org?rev=10684&view=rev
Log:
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.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml?rev=10684&r1=10683&r2=10684&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml Fri Oct 13 10:53:12 2006
@@ -564,6 +564,13 @@
 \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.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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml?rev=10684&r1=10683&r2=10684&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml Fri Oct 13 10:53:12 2006
@@ -90,6 +90,9 @@
     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
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=10684&r1=10683&r2=10684&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Fri Oct 13 10:53:12 2006
@@ -1,1 +1,1 @@
-253
+255