From 48e9d255ae71b6325ab1d92c83bca4728b449410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 23 Apr 2014 11:41:24 +0200 Subject: [PATCH] [FIX] web: list view: fixed button behavior - icon-like behavior is the default behavior - text-based buttons (using btn_txt class) are used whenever no icon is given to the button in a list view. This way the previous behavior is always the default behavior, and the css modifications are done only for the text-based buttons, avoiding side-effects. bzr revid: tde@openerp.com-20140423094124-8zq3yysy616aowu2 --- addons/web/static/src/css/base.css | 10 ++++++---- addons/web/static/src/css/base.sass | 7 +++++-- addons/web/static/src/xml/base.xml | 7 +++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9dd8e55723e..503d6f84aa1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2776,13 +2776,15 @@ padding: 3px 6px; white-space: pre-line; } -.openerp .oe_list_content > tbody > tr > td > button.btn_img, .openerp .oe_list_content > tbody > tr > th > button.btn_img { +.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { border: none; background: transparent; padding: 0; - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +} +.openerp .oe_list_content > tbody > tr > td > button.btn_txt, .openerp .oe_list_content > tbody > tr > th > button.btn_txt { + border: 1px solid rgba(0, 0, 0, 0.4); + background: #e3e3e3; + padding: 3px 12px; } .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child { width: 17px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ebffed27410..8ebb2d88ca3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2248,11 +2248,14 @@ $sheet-padding: 16px padding: 3px 6px white-space: pre-line > td, > th - > button.btn_img + > button border: none background: transparent padding: 0 - @include box-shadow(none) + > button.btn_txt + border: 1px solid rgba(0,0,0,0.4) + background: #e3e3e3 + padding: 3px 12px > td.oe_list_checkbox:first-child, th.oe_list_checkbox:first-child width: 17px &:after diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a08de0bc4bd..85f3d3cf63b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -800,12 +800,11 @@ + t-att-class="disabled ? 'oe_list_button_disabled btn_txt oe_link' : 'btn_txt oe_link'" + >