From 4b62fae5d38e003547e57787d7dd258c72b49d46 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Thu, 27 May 2010 08:19:04 +0000 Subject: [PATCH] CSS fixes so listbox style do not mess with bottom actions. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35668 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../listbox_action_widget.xml | 2 +- .../listbox_action_widget.xml | 9 ----- .../erp5_km_theme/km_css/listbox.css.xml | 36 +++++++------------ bt5/erp5_km/bt/revision | 2 +- 4 files changed, 15 insertions(+), 34 deletions(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/listbox_action_widget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/listbox_action_widget.xml index da25c069a9..2a04e5e2a6 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/listbox_action_widget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/listbox_action_widget.xml @@ -104,7 +104,7 @@ <dictionary> <item> <key> <string>css_class</string> </key> - <value> <string>hidden_label</string> </value> + <value> <string>hidden_label listbox-action-widget</string> </value> </item> <item> <key> <string>default</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/listbox_action_widget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/listbox_action_widget.xml index e4b1de7c0a..9f193a510e 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/listbox_action_widget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/listbox_action_widget.xml @@ -13,7 +13,6 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>css_class</string> <string>default</string> <string>editable</string> </list> @@ -57,10 +56,6 @@ <key> <string>tales</string> </key> <value> <dictionary> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>default</string> </key> <value> @@ -86,10 +81,6 @@ <key> <string>values</string> </key> <value> <dictionary> - <item> - <key> <string>css_class</string> </key> - <value> <string>hidden_label</string> </value> - </item> <item> <key> <string>default</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml index 1377c35e4e..13471023ad 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/listbox.css.xml @@ -56,9 +56,12 @@ div.search_popup{\n /******************/ \n /* Listbox action */\n /******************/\n -.bottom_actions {\n +.listbox-action-widget {\n float:none;\n }\n +.listbox-action-widget div.bottom_actions{\n + float:left;\n +}\n \n /* Title of the bar */\n .listbox_actions_title{\n @@ -73,10 +76,6 @@ div.search_popup{\n /* Sub container for the buttons*/\n .buttons_group {\n background-color:#E0DFD1;\n - /*font-family:Arial,Verdana,Helvetica,Sans;\n -\n - margin-right:39px;\n - padding-left:10px; */\n margin-right:30px;\n padding-top:3px;\n width:auto;\n @@ -84,7 +83,7 @@ div.search_popup{\n }\n \n /* Buttons */\n -.bottom_actions button, .bottom_actions a.button {\n +.listbox-action-widget button, .listbox-action-widget a.button {\n background-image: url(\'./km_img/button_background.png\') ;\n background-position: 100% 0;\n background-color: inherit;\n @@ -96,18 +95,18 @@ div.search_popup{\n margin-right:3px;\n margin-bottom:3px;\n }\n -.bottom_actions button:hover,.bottom_actions a:hover {\n +.listbox-action-widget button:hover,.listbox-action-widget a:hover {\n background-position:100% 100%;\n }\n \n /* a as button */\n -.bottom_actions a.button{\n +.listbox-action-widget a.button{\n display:block;\n margin-left: 9px;\n }\n \n /* Image in button */\n -.bottom_actions span.image{\n +.listbox-action-widget span.image{\n background-repeat:no-repeat;\n background-position:center center;\n display:block;\n @@ -121,12 +120,12 @@ div.search_popup{\n }\n \n /* Description of botton */\n -.bottom_actions span.description{\n +.listbox-action-widget span.description{\n font-size:10px;\n }\n \n /* Global button span */\n -.bottom_actions button > span, .bottom_actions a > span{\n +.listbox-action-widget button > span, .listbox-action-widget a > span{\n display:block;\n background-color:inherit;\n background-image:url(\'./km_img/button_background.png\');\n @@ -141,10 +140,10 @@ div.search_popup{\n white-space:nowrap;\n width:100%;\n }\n -.bottom_actions button:hover > span, .bottom_actions a:hover > span{\n +.listbox-action-widget button:hover > span, .listbox-action-widget a:hover > span{\n background-position:0 100%;\n }\n -.bottom_actions span.description span {\n +.listbox-action-widget span.description span {\n left:4px;\n position:relative;\n }\n @@ -165,12 +164,12 @@ div.search_popup{\n /*********************/\n /* Listbox style */\n /*********************/\n -/* Listbox Block */\n .listbox_left {\n margin-right: 4px;\n width: auto;\n float: left;\n }\n +\n .listbox_center{\n float: left;\n }\n @@ -221,9 +220,6 @@ div.extendedSearchBar {\n float:left;\n margin-top:0;\n padding:1em 0 0.5em;\n - /*right:5px;\n - text-align:right;\n - width:350px;*/\n }\n div.extendedSearchBar input.button{\n background-image: url(\'./km_img/search_background.png\');\n @@ -274,12 +270,6 @@ background-color:#EBEBE2;\n max-width: 145px;\n }\n \n -/*\n -.listbox input {\n -width:96%;\n -}\n -*/\n -\n button.sort_button_desc{\n background-image: url(\'./km_img/switch_desc.png\');\n }\n diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 4e6ee1e5ff..c6a6947194 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1421 +1422 \ No newline at end of file -- 2.30.9