summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-06-21 16:04:23 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-06-21 16:04:23 +0200
commit04121f8b03478b860d3749cedbba785283f4a86e (patch)
tree29dc9d9637caad7b4ae73669004889573020328c /addons/base/static/src
parent3cb34f3f852fb5bff92090fe3f067df95332e49d (diff)
[imp] small improvement to advanced filters
bzr revid: nicolas.vanhoren@openerp.com-20110621140423-efbxmrjuwlu8piy1
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/css/base.css16
-rw-r--r--addons/base/static/src/xml/base.xml1
2 files changed, 14 insertions, 3 deletions
diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index ca4c8d0de87..e3a1e8b26fd 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -547,13 +547,23 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
}
.openerp .searchview_extended_group {
- border-bottom: #696969 solid 1px;
padding: 3px;
margin: 2px;
}
-.openerp .searchview_extended_group.last_group {
- border-bottom: none;
+.openerp .searchview_extended_group .oe_adv_filters_and {
+ border-bottom: 1px solid black;
+ text-align: center;
+}
+.openerp .searchview_extended_group .oe_adv_filters_and span {
+ background: #F0EEEE;
+ position: relative;
+ top: 0.5em;
+ padding: 0 1em 0 1em;
+}
+
+.openerp .searchview_extended_group.last_group .oe_adv_filters_and {
+ display: none;
}
.openerp .oe_search-view-custom-filter-btn span {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9645ce7cee2..b03bb044ba4 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -804,6 +804,7 @@
</div>
<a class="searchview_extended_add_proposition" href="javascript:void(0)">
<span>Add condition</span></a>
+ <div class="oe_adv_filters_and"><span>and</span></div>
</div>
</t>
<t t-name="SearchView.extended_search.proposition">