From a3369a1f264c236c4ccb136ead8151d61b2e7cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 29 Oct 2014 11:21:32 +0100 Subject: [IMP] add a 'or' operator between custom filters (web) --- addons/web/static/src/css/base.css | 14 ++++++++++++++ addons/web/static/src/css/base.sass | 10 ++++++++++ 2 files changed, 24 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 64ad17efe07..e5fb1a2b2f9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1440,6 +1440,20 @@ padding-right: 10px; margin-bottom: 5px; } +.openerp .oe-search-options .dropdown-menu li.oe-filter-condition .o-or-filter { + display: none; +} +.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition { + margin-top: 10px; +} +.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition .o-or-filter { + display: block; +} +.openerp .oe-search-options .dropdown-menu .o-or-filter { + position: absolute; + left: 5px; + top: 5px; +} .openerp .oe-search-options a { display: inline-block; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e04ed87d1c4..fcf05d19880 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1227,6 +1227,16 @@ $sheet-padding: 16px padding-left: 25px padding-right: 10px margin-bottom: 5px + .o-or-filter + display: none + li.oe-filter-condition + li.oe-filter-condition + margin-top: 10px + .o-or-filter + display: block + .o-or-filter + position: absolute + left: 5px + top: 5px a display: inline-block -- cgit v1.2.3