diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-03 14:05:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-03 14:05:48 +0100 |
| commit | 55b810dc70cccb23144986d54fd28bb5f91f2b1b (patch) | |
| tree | a83dda56dac7f02be26f6821dea5b2f1926ea7b0 /addons/web/static/src/less | |
| parent | 8bc7cebd9c19ae8f77378d115a8401d7b7de56b0 (diff) | |
| parent | 726b91b9fbc994c6b2f2cb45e36d4c224497f11b (diff) | |
[MERGE] forward port branch saas-11.1 up to 726b91b9fbc
Diffstat (limited to 'addons/web/static/src/less')
| -rw-r--r-- | addons/web/static/src/less/fields.less | 10 | ||||
| -rw-r--r-- | addons/web/static/src/less/search_view.less | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/addons/web/static/src/less/fields.less b/addons/web/static/src/less/fields.less index 358e9e81897..3c6428e5c75 100644 --- a/addons/web/static/src/less/fields.less +++ b/addons/web/static/src/less/fields.less @@ -156,8 +156,8 @@ } } - .o-tag-color(@size: 0) when (@size < @odoo-nb-ui-color) { - .o_tag_color_@{size} when (@size = 0) { + .o-tag-color(@size: 0) when (@size = 0) { + .o_tag_color_@{size} { & { background-color: white; color: ~"@{odoo-color-@{size}}"; @@ -167,7 +167,10 @@ background-color: ~"@{odoo-color-@{size}}"; } } - .o_tag_color_@{size} when (@size > 0) { + .o-tag-color(@size + 1); + } + .o-tag-color(@size: 0) when (@size > 0) and (@size < @odoo-nb-ui-color) { + .o_tag_color_@{size} { &, &::after { background-color: ~"@{odoo-color-@{size}}"; } @@ -175,7 +178,6 @@ .o-tag-color(@size + 1); } .o-tag-color(); - } // Stars diff --git a/addons/web/static/src/less/search_view.less b/addons/web/static/src/less/search_view.less index a9d6d28e9e4..0261806631a 100644 --- a/addons/web/static/src/less/search_view.less +++ b/addons/web/static/src/less/search_view.less @@ -139,6 +139,9 @@ // Filters .o_filters_menu { .o-selected-li; + + max-height: ~"calc(100vh - 125px)"; + overflow: auto; .o_filter_condition { .o-search-options-dropdown-custom-li; @@ -175,6 +178,9 @@ // Group By .o_group_by_menu { .o-selected-li; + + max-height: ~"calc(100vh - 125px)"; + overflow: auto; .divider {display: none;} // hide the divider by default (no group) .o_add_group { // add button @@ -188,6 +194,9 @@ max-height: 75vh; overflow-y: auto; .o-selected-li; + + max-height: ~"calc(100vh - 125px)"; + overflow: auto; .divider {display: none;} // hide the divider by default (no favorite) .o-searchview-custom-private, .o-searchview-custom-public { |