diff options
| author | pka-odoo <pka@odoo.com> | 2020-05-04 09:05:51 +0000 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2020-05-04 14:31:11 +0000 |
| commit | c80fa71adbb2410b4ed5328f9093502969ff02bb (patch) | |
| tree | e9f369950f8fb36b842f6e78f8a444a985f295a5 /addons/web/static/src | |
| parent | 470fa48686f5ac430f0f7eb0853cf2c81dca62c0 (diff) | |
[IMP] web,*: search menus always visible
Part of task 2234547
Co-authored-by: Mohammed Shekha <msh@odoo.com>
Co-authored-by: Aaron Bohy <aab@odoo.com>
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/control_panel/control_panel.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/scss/search_view.scss | 10 | ||||
| -rw-r--r-- | addons/web/static/src/scss/search_view_extra.scss | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 10 |
4 files changed, 6 insertions, 21 deletions
diff --git a/addons/web/static/src/js/control_panel/control_panel.js b/addons/web/static/src/js/control_panel/control_panel.js index fee26c3779d..5d42cfc2fbe 100644 --- a/addons/web/static/src/js/control_panel/control_panel.js +++ b/addons/web/static/src/js/control_panel/control_panel.js @@ -13,7 +13,7 @@ odoo.define('web.ControlPanel', function (require) { const { useModel } = require('web.model'); const { Component, hooks } = owl; - const { useRef, useState, useSubEnv } = hooks; + const { useRef, useSubEnv } = hooks; /** * TODO: remove this whole mechanism as soon as `cp_content` is completely removed. @@ -116,9 +116,6 @@ odoo.define('web.ControlPanel', function (require) { if (this.env.controlPanelModel) { this.model = useModel('controlPanelModel'); } - this.state = useState({ - displayDropdowns: true, - }); // Reference hooks this.contentRefs = { diff --git a/addons/web/static/src/scss/search_view.scss b/addons/web/static/src/scss/search_view.scss index 8dd4d3e400e..88900e6127f 100644 --- a/addons/web/static/src/scss/search_view.scss +++ b/addons/web/static/src/scss/search_view.scss @@ -3,11 +3,6 @@ padding: 0 20px 1px 0; position: relative; - .o_searchview_more { - cursor: pointer; - font-size: 16px; - } - .o_searchview_input_container { display: flex; flex-flow: row wrap; @@ -55,11 +50,6 @@ width: 75px; } - .o_searchview_more { - cursor: pointer; - font-size: 16px; - } - .o_searchview_autocomplete { width: 100%; @include o-position-absolute(100%, $left: auto); diff --git a/addons/web/static/src/scss/search_view_extra.scss b/addons/web/static/src/scss/search_view_extra.scss index 11107f2ad02..2530f060c08 100644 --- a/addons/web/static/src/scss/search_view_extra.scss +++ b/addons/web/static/src/scss/search_view_extra.scss @@ -24,7 +24,7 @@ border: none; padding: 4px 0 0 0; } - .o_searchview_more { + .o_searchview_icon { @include o-position-absolute($top: 6px, $right: 5px); } .o_searchview_autocomplete li.o_selection_focus { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9d59017cee7..62370e8f9f4 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -29,12 +29,10 @@ t-ref="searchView" > <div t-if="props.withSearchBar" class="o_searchview" role="search" aria-autocomplete="list" > - <i t-if="props.searchMenuTypes.length" - t-attf-class="o_searchview_more fa fa-search-{{ state.displayDropdowns ? 'minus' : 'plus' }}" - title="Advanced Search..." + <i class="o_searchview_icon fa fa-search" + title="Search..." role="img" - aria-label="Advanced Search..." - t-on-click.prevent="state.displayDropdowns = !state.displayDropdowns" + aria-label="Search..." /> <SearchBar t-if="props.withSearchBar" fields="fields"/> </div> @@ -55,7 +53,7 @@ role="search" t-ref="searchViewButtons" > - <t t-if="props.withSearchBar and state.displayDropdowns"> + <t t-if="props.withSearchBar"> <FilterMenu t-if="props.searchMenuTypes.includes('filter')" class="o_filter_menu" fields="fields" |