From 694a819277ff2e662f24df9a25e6ae5248bc76be Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Thu, 25 Nov 2010 08:02:34 +0000 Subject: [PATCH] Do not use any longer erp5_knowledge_box_web.css (but reuse some of its CSS for KM). The gadget system should by default provide by default CSS for ERP5 standard UI appearance and not assume or provide "web" like CSS as it can not know how would a web theme use it. It's job of web theme override what's needed in core gadget's CSS files. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40643 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_km_theme/km_css/gadget.css.xml | 135 +++++++++++++++++- .../template_erp5_km_minimal.xml | 1 - bt5/erp5_km/bt/revision | 2 +- 3 files changed, 134 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml index 81cf7de512..006bfbf698 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml @@ -12,7 +12,7 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts90671605.44</string> </value> + <value> <string>ts90671860.93</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -32,6 +32,137 @@ /* - add dynamic properties */\n /****************************************************************/\n \n +\n +/* CSS Web layout (one column) for Gadgets */\n +\n +#page_wrapper {\n + background: transparent;\n + padding: 0em;\n + min-height: 200px;\n +}\n +\n +.portal-column {\n + width: 100%;\n + min-height: 100px;\n + margin-right: 5px;\n +}\n +\n +#portal-column-2{\n + margin-right: 0px;\n +}\n +\n +.block {\n + margin-top: 0.5em;\n +}\n +\n +.block li {\n + margin-left: 0.5em;\n + /*list-style-type:none;*/\n +}\n +\n +.block h3 span.gadget_title{\n + background: none;\n + border-top: none;\n +}\n +\n +\n +.box_inner_content {\n + border: 1px solid #c3c3ee;\n + border-top: none;\n + overflow: auto;\n +}\n +\n +.edit-form {\n + border: none;\n + background-color: #ECECEC;\n + border-left: 1px solid #c3c3ee;\n + border-right: 1px solid #c3c3ee;\n +}\n +\n +\n +h3.handle {\n + margin: 0;\n + padding: 0 0 0 10px;\n + color: #000000;\n + font-size: 10px;\n + border: 1px solid #c3c3ee;\n + background: none;\n + background-color: #ECECEC;\n +}\n +\n +h3.handle span.handle {\n + display: block;\n + min-height:20px;\n + padding: 5px 5px 0 0;\n + background: none;\n +}\n +\n +\n +#add_new_gadget_link {\n + border-bottom: none;\n +}\n +\n +#page_wrapper .content{\n + border: none;\n +}\n +\n +.tab {\n + background-color: #ECECEC;\n +}\n +\n +.tab_selected {\n + background-color: #FFFFFF;\n + border-bottom:1px solid #FFFFFF;\n +}\n +\n +.toggable_dialog {\n + left:200px;\n + top: 100px;\n + width: 200px;\n +}\n +\n +.toggable_dialog button{\n + padding: 0em;\n + float:left;\n +}\n +\n +.toggable_dialog h3{\n + margin-bottom: 1em;\n +}\n +\n +#tabs li{\n + margin-left:0em;\n +}\n +\n +.wait_block p{\n + text-align: center;\n +}\n +\n +#add_new_tab_diloag_link{\n + margin-left: 0.5em;\n +}\n +\n +.border_bottom0px{\n + border-bottom: 1px solid #FFFFFF;\n +}\n +\n +/* disable cursor for anonymous users */\n +.portal-column-undraggable .handle{\n + cursor: default;\n +}\n +\n +/* add space between fieldsets for gadgtes */\n +div.block fieldset > div {\n + margin-bottom: 0.3em;\n +}\n +div.block fieldset label{\n + text-align: left;\n + display: block;\n +}\n +\n +\n +\n +\n /* 3 columng gadget layout */\n div.portal-column {\n width:32.9%; \n @@ -634,7 +765,7 @@ div.block fieldset.gadget-profile div.field{\n </item> <item> <key> <string>size</string> </key> - <value> <int>10754</int> </value> + <value> <int>12501</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml index cbbb84dd63..18b83e7ccc 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml @@ -110,7 +110,6 @@ \'%s/erp5_listbox.css\' % portal_path,\n \'%s/erp5_web_toolbar.css\' % portal_path,\n \'%s/erp5_knowledge_box.css\' % portal_path,\n - \'%s/erp5_knowledge_box_web.css\' % portal_path,\n \'%s/km_css/km.css\' % portal_path,\n \'%s/km_css/gadget.css\' % portal_path,\n \'%s/km_css/km_listbox.css\' % portal_path,\n diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 31edc2fcfa..8215fe8654 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1692 \ No newline at end of file +1693 \ No newline at end of file -- 2.30.9