diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-29 18:35:14 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-29 18:35:14 +0100 |
| commit | bdfef60d60d78c5e7360fdabe80e70ea208e6078 (patch) | |
| tree | d6487cd949033dfa7a1f75a5458993336a6e8501 /addons/web | |
| parent | 95ef46096110512117a7b7dd9bc797732be36b26 (diff) | |
| parent | cd5c8a02f9560b2a8b5c39182adee7ade1bf595c (diff) | |
[MERGE] forward port branch saas-11.3 up to cd5c8a02f95
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/views/search/search_filters.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/scss/navbar_mobile.scss | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/search/search_filters.js b/addons/web/static/src/js/views/search/search_filters.js index 4455a7b9bdf..86fdff9f0cb 100644 --- a/addons/web/static/src/js/views/search/search_filters.js +++ b/addons/web/static/src/js/views/search/search_filters.js @@ -185,8 +185,10 @@ var DateTime = Field.extend({ operators: [ {value: "=", text: _lt("is equal to")}, {value: "!=", text: _lt("is not equal to")}, - {value: ">=", text: _lt("is after")}, - {value: "<=", text: _lt("is before")}, + {value: ">", text: _lt("is after")}, + {value: "<", text: _lt("is before")}, + {value: ">=", text: _lt("is after or equal to")}, + {value: "<=", text: _lt("is before or equal to")}, {value: "between", text: _lt("is between")}, {value: "∃", text: _lt("is set")}, {value: "∄", text: _lt("is not set")} diff --git a/addons/web/static/src/scss/navbar_mobile.scss b/addons/web/static/src/scss/navbar_mobile.scss index 6ef917b8517..f4593436163 100644 --- a/addons/web/static/src/scss/navbar_mobile.scss +++ b/addons/web/static/src/scss/navbar_mobile.scss @@ -23,7 +23,6 @@ position: relative; height: $o-navbar-height; - overflow: hidden; > ul { > li { @@ -39,6 +38,7 @@ &.o_menu_sections { width: 100%; + display: none; .dropdown-menu.show { position: static; @@ -82,6 +82,9 @@ body.o_mobile_menu_opened > .o_main_navbar { height: 100%; overflow: auto; + .o_menu_sections { + display: block; + } } } |