diff options
| author | Minh Tran <mit@openerp.com> | 2012-05-31 15:41:50 +0200 |
|---|---|---|
| committer | Minh Tran <mit@openerp.com> | 2012-05-31 15:41:50 +0200 |
| commit | 7d0196053867ef2bef9d9929d8c4cf3e4a70cde6 (patch) | |
| tree | dad3b6e222412fa39442d18c5ec5d998b1166dea /addons/web/static/src | |
| parent | a97180270b0bc0d485e44e71c90f6162f1589ea5 (diff) | |
searchview fixes
bzr revid: mit@openerp.com-20120531134150-nqxas33g0ow27ciy
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 14 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 11 | ||||
| -rw-r--r-- | addons/web/static/src/js/search.js | 2 |
3 files changed, 18 insertions, 9 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6510793a2d1..ab5f261dbf2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -99,10 +99,6 @@ list-style-type: none; } .openerp input, .openerp textarea { - height: 14px; - padding: 3px; - font-size: 11px; - line-height: 18px; border: 1px solid #cccccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1186,6 +1182,16 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; } +.openerp .oe_searchview input, .openerp .oe_searchview textarea { + padding: 3px; + height: 14px; + font-size: 11px; + line-height: 18px; + border: 1px solid #cccccc; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} .openerp .oe_searchview.oe_focused { border-color: #a6a6fe; -moz-box-shadow: 0 1px 2px #a6a6fe inset; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5feabf83628..75c351a8558 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -140,10 +140,6 @@ $colour4: #8a89ba li list-style-type: none input, textarea - height: 14px - padding: 3px - font-size: 11px - line-height: 18px border: 1px solid #ccc @include radius(3px) @@ -938,6 +934,13 @@ $colour4: #8a89ba background: white @include radius(13px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) + input, textarea + padding: 3px + height: 14px + font-size: 11px + line-height: 18px + border: 1px solid #ccc + @include radius(3px) &.oe_focused border-color: $facets-border-selected @include box-shadow(0 1px 2px $facets-border-selected inset) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 9ccb41e1c3f..f9e737471ae 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1642,7 +1642,7 @@ instance.web.search.Filters = instance.web.search.Input.extend({ var col1 = [], col2 = _(this.view.controls).map(function (inputs, group) { var filters = _(inputs).filter(is_group); return { - name: group === 'null' ? _t("<span class='oe_i'>q</span> Filters") : "<span class='oe_i'>w</span> " + group, + name: group === 'null' ? "<span class='oe_i'>q</span> " + _t("Filters") : "<span class='oe_i'>w</span> " + group, filters: filters, length: _(filters).chain().map(function (i) { return i.filters.length; }).sum().value() |