From ac4323c656d575e3942c0b17d44df99dc87cc01f Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Wed, 24 Feb 2010 16:27:17 +0000 Subject: [PATCH] revert r33092 as it is not maintanable to have multiple css to maintain. A better solution have to be found. I open a new bug to explain the problem : #1635 Thanks to romain to point this problem out. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33099 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_editor.css.xml | 240 ------------------ bt5/erp5_web_multiflex5_theme/bt/revision | 2 +- 2 files changed, 1 insertion(+), 241 deletions(-) delete mode 100644 bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_editor.css.xml diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_editor.css.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_editor.css.xml deleted file mode 100644 index f21ddde6a1..0000000000 --- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_editor.css.xml +++ /dev/null @@ -1,240 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_text</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n -\n -/****************************************************************/\n -/* This is minimal file to have the same rendering inside */\n -/* FCKEditor than in the page rendering */\n -/* Design: Multiflex-5.3 */\n -/* File: Reset all grid and content styles */\n -/*--------------------------------------------------------------*/\n -/* Design: www.1234.info */\n -/* Date: January 22, 2008 */\n -/*--------------------------------------------------------------*/\n -/* License: Fully open source without restrictions. */\n -/* Please keep footer credits with the words */\n -/* "Design by 1234.info". Thank you! */\n -/****************************************************************/\n -\n -/***********/\n -/* RESET */\n -/***********/\n -\n -html{color:rgb(0,0,0); background:rgb(255,255,255);}\n -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0; padding:0;}\n -table{border-collapse:collapse; border-spacing:0;}\n -fieldset,img{border:0;}\n -/*address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}*/\n -li{list-style:none;}\n -caption,th{text-align:left;}\n -h1,h2,h3,h4,h5,h6{font-size:100%; font-weight:normal;}\n -q:before,q:after{content:\'\';}\n -abbr,acronym {border:0; font-variant:normal;}\n -sup {vertical-align:text-top;} /* to preserve line-height and selector appearance */\n -sub {vertical-align:text-bottom;} /* to preserve line-height and selector appearance */\n -input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;} /* to preserve line-height and selector appearance */\n -legend{color:rgb(0,0,0);} /*because legend doesn\'t inherit in IE */\n -\n -\n -/****************************************************************/\n -/* Design: Multiflex-5.4 */\n -/* Type: Design with sidebar */\n -/* File: Grid Toolbox */\n -/* Option: Design with sidebar */\n -/*--------------------------------------------------------------*/\n -/* Design: www.1234.info */\n -/* Date: March 13, 2008 */\n -/*--------------------------------------------------------------*/\n -/* License: Fully open source without restrictions. */\n -/* Please keep footer credits with the words */\n -/* "Design by 1234.info". Thank you! */\n -/****************************************************************/\n -\n -/******************/\n -/* GLOBAL LAYOUT */\n -/******************/\n -\n - body {font-size:62.5%; background-color:rgb(255,255,255); font-family:arial,sans-serif;} /*Font-size: 1.0em = 10px when browser default size is 16px*/\n -/*************/\n -/* CONTENT */\n -/*************/\n -\n -/* HEADING -- Standard icon (1-Column / 2-Column) */\n -h1 {margin:0; padding:5px 50px 12px 20px; border-bottom:solid 1px rgb(215,215,215); background: url(https://sanef.erp5.net/test/web_site_module/intrasite/mf54_image/icon_celltitle_level1.gif) no-repeat; background-position:632px 5px; color:rgb(75,75,75); font-weight:bold; font-size:220% !important /*Non-IE6*/; font-size:200% /*IE6*/;}\n -\n -h2 {clear:both; /*Start IE Hack*/ position:relative; z-index:1; top:-1px /* End IE Hack to remove vertical -1px margin bug otherwise produced by margin*/; margin: 0 20px 0 20px; padding:15px 35px 5px 0; border-top:solid 1px rgb(215,215,215); background: url(https://sanef.erp5.net/test/web_site_module/intrasite/mf54_image/icon_celltitle_level2.gif) no-repeat; background-position:right 15px; color:rgb(75,75,75); font-weight:bold; font-size:180% !important /*Non-IE6*/; font-size:160% /*IE6*/;}\n -h3 {margin:1.0em 0 -0.3em 0; padding:0 20px 0 20px; color:rgb(75,75,75); font-weight:bold; font-size:180% !important /*Non-IE6*/; font-size:160% /*IE6*/;}\n -h3.line {/*Start IE Hack*/ position:relative; z-index:1; top:-1px; /* End IE Hack vertical alignment to blend top border with h1, if directly after each other*/ margin:0 20px -0.3em 20px; padding:1.0em 0 0 0; border-top:solid 1px rgb(215,215,215);}\n -h4 {margin:1.0em 0 -0.3em 0; padding:0 20px 0 20px; color:rgb(75,75,75); font-weight:bold; font-size:160% !important /*Non-IE6*/; font-size:140% /*IE6*/;}\n -h5 {margin:1.0em 0 -0.5em 0; padding:0 20px 0 20px; color:rgb(75,75,75); font-weight:bold; font-size:140% !important /*Non-IE6*/; font-size:125% /*IE6*/;}\n -h6 {margin:0.4em 0 0.5em 0; padding:0 20px 0 20px; color:rgb(50,50,50); font-weight:normal; font-size:130% !important /*Non-IE6*/; font-size:115% /*IE6*/;}\n -\n -h1.noicon {background:none;}\n -h2.noicon {background:none;}\n -\n -/* PARAGRAPH TEXT */\n -p {margin:1.0em 0 1.0em 0; color:rgb(0,0,0); line-height:1.3em; padding: 0 20px 0 20px; font-size:131% !important /*Non-IE6*/; font-size:115% /*IE6*/;}\n -blockquote {clear:both; margin:0 30px 0.6em 30px; font-size:90%;}\n -\n -/* LIST */\n -ul {margin:1.4em 0 1.0em 0; padding:0em 20px 0em 20px; list-style:none;}\n -ul li {margin:0 0 0.3em 2px; padding:0 0 0 12px; background:url(https://sanef.erp5.net/test/web_site_module/intrasite/mf54_image/bg_bullet_square.gif) no-repeat 0 0.5em; line-height:1.3em; font-size:131% !important /*Non-IE6*/; font-size:115% /*IE6*/;}\n -ol {margin:1.4em 0 1.0em 0; padding:0 20px 0 40px !important /*Non-IE6*/; padding:0 20px 0 50px /*IE6*/;}\n -ol li {list-style-type:decimal; list-style-position:outside; margin:0 0 0.3em 3px; line-height:1.3em; font-size:131% !important /*Non-IE6*/; font-size:115% /*IE6*/;}\n -ul.indent {padding:0 50px 0 50px;}\n -ol.indent {padding:0 20px 0 70px !important /*Non-IE6*/; padding:0 20px 0 80px /*IE6*/;}\n -\n -/* TABLE (1-Column / 2-Column) */\n -table {clear:both; width:636px; margin:2.0em 0 0.2em 20px; border-collapse:collapse; empty-cells:show; background-color:rgb(233,232,244);}\n -\n -table th.top {height:3.5em; padding:0 7px 0 7px; empty-cells:show; background-color:rgb(175,175,175); text-align:left; color:rgb(255,255,255); font-weight:bold; font-size:120% !important /*Non-IE6*/; font-size:110% /*IE6*/;}\n -table th {height:3.0em; padding:2px 20px 2px 7px; border:solid 2px rgb(245,245,245); background-color:rgb(225,225,225); text-align:left; color:rgb(80,80,80); font-weight:bold; font-size:120% !important /*Non-IE6*/; font-size:110% /*IE6*/;}\n -table td {height:3.0em; padding:2px 7px 2px 7px; border:solid 2px rgb(245,245,245); background-color:rgb(225,225,225); text-align:left; font-weight:normal; color:rgb(80,80,80); font-size:120% !important /*Non-IE6*/; font-size:110% /*IE6*/;}\n -p.caption {clear:both; margin:0.5em 0 2.0em 0; text-align:left; color:rgb(80,80,80); font-size:120% !important /*Non-IE6*/; font-size:110% /*IE6*/;}\n -\n -\n -/**********/\n -/* IMAGES */\n -/**********/\n -\n -img {clear:both; float:left; margin:3px 15px 7px 0; border:solid 3px rgb(200,200,200);}\n -img.center {clear:both; float:none; display:block; margin:0 auto; border:solid 3px rgb(200,200,200);}\n -img.right {clear:both; float:right; margin:3px 0 7px 10px; border:solid 3px rgb(200,200,200);}\n -\n -/*********/\n -/* LINKS */\n -/*********/\n -\n -/* Text links */\n -a {color:rgb(70,122,167); font-weight:bold; text-decoration:none;}\n -a:hover {color:rgb(42,90,138); text-decoration:underline;}\n -a:visited {color:rgb(42,90,138);}\n -\n -/*Image links */\n -a img {border:solid 3px rgb(200,200,200);}\n -a:hover img {border:solid 3px rgb(175,175,175);}\n -\n -/******************************************/\n -/* ADDITIONAL USER STYLES */\n -/* If you want to add your own styles, */\n -/* then add them here in order to avoid */\n -/* a mixup with the default styles. */\n -/******************************************/\n -\n -/******************************************/\n -/* ERP5 Extensions */\n -/******************************************/\n -\n -/* bug fix */\n -ul li ul li{\n - font-size:inherit !important /*Non-IE6*/; font-size:inherit /*IE6*/;\n -}\n -ul.indent ul.indent {\n - padding:0em 20px;\n -}\n -\n -/* no border for images */\n -img, img.center, img.left, a img, a:hover img {\n - border:none;\n -}\n -\n -p.clear {\n - font-size:0 !important;\n -}\n -\n -fieldset {\n - font-size:120%;\n -}\n -\n -fieldset legend {\n - padding: 10px 0 0 20px;\n - font-weight: bold;\n -}\n -\n -fieldset label {\n - padding: 0 10px 0 20px;\n - float: left;\n - width: 140px;\n - font-weight: bold;\n - color: #666;\n -}\n -\n -fieldset div.input {\n - padding: 0 20px 0 0;\n - margin-left:170px;\n -}\n -\n -fieldset div.page div.input,\n -fieldset.bottom div.input {\n - padding: 0;\n - margin:0\n -}\n -\n -div.editable a > img {\n - float:none;\n - margin:0;\n - border:none;\n -}\n - - -]]></string> </value> - </item> - <item> - <key> <string>content_type</string> </key> - <value> <string>text/html</string> </value> - </item> - <item> - <key> <string>expand</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>erp5_editor.css</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_web_multiflex5_theme/bt/revision b/bt5/erp5_web_multiflex5_theme/bt/revision index 3968aef87f..6547e41559 100644 --- a/bt5/erp5_web_multiflex5_theme/bt/revision +++ b/bt5/erp5_web_multiflex5_theme/bt/revision @@ -1 +1 @@ -170 \ No newline at end of file +171 \ No newline at end of file -- 2.30.9