diff options
| author | Kaushalya Mandaliya <kma@odoo.com> | 2020-02-24 12:54:26 +0000 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2020-03-04 09:40:29 +0000 |
| commit | 617e53229e6342f30f89c6ed03a2d3248c56ba4f (patch) | |
| tree | f34055eb2a2c0ff3f1703a9b684d3ec9385480ed /addons | |
| parent | 279f4da88d0c2782451ead42430d2945c8c8ebe9 (diff) | |
[IMP] web: avoid control panel height flickering
Before this commit, control panel height flickered when the
bottom bar only contained the pager (no view switcher and no
action buttons): when the user added a filter matched by no
record, the pager disappeared and the bottom bar height went from
35px to 30px.
To reproduce the issue, go to Data Cleaning (have some data), and
add a filter.
This commit reworks a bit the control panel layout such that the
bottom bar always keeps the same height.
task-2178933
closes odoo/odoo#46117
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/web/static/src/scss/base_settings.scss | 3 | ||||
| -rw-r--r-- | addons/web/static/src/scss/control_panel.scss | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/addons/web/static/src/scss/base_settings.scss b/addons/web/static/src/scss/base_settings.scss index f2b25e2e6f8..6b64f182999 100644 --- a/addons/web/static/src/scss/base_settings.scss +++ b/addons/web/static/src/scss/base_settings.scss @@ -24,7 +24,6 @@ .o_panel { display: flex; flex-flow: row wrap; - margin-bottom: $o-sheet-vpadding*0.5; width: 100%; .title, .o_setting_search { @@ -54,7 +53,7 @@ .o_form_statusbar { padding: 0; - margin: 0; + margin: 5px 0px; border: 0; .btn-primary, .btn-link { diff --git a/addons/web/static/src/scss/control_panel.scss b/addons/web/static/src/scss/control_panel.scss index c08695fc28d..e39fa1aaf2b 100644 --- a/addons/web/static/src/scss/control_panel.scss +++ b/addons/web/static/src/scss/control_panel.scss @@ -1,13 +1,14 @@ .o_control_panel { border-bottom: 1px solid darken($o-control-panel-background-color, 20%); - @include o-webclient-padding($top: 10px, $bottom: 10px); + @include o-webclient-padding($top: 5px, $bottom: 5px); background-color: $o-control-panel-background-color; > div { display: flex; justify-content: space-between; min-height: 30px; + margin: 5px 0px; } .breadcrumb, .o_cp_left { @@ -43,7 +44,6 @@ .o_cp_left { display: flex; justify-content: space-between; - margin-top: 5px; > .o_cp_sidebar { padding-right: 10px; @@ -76,7 +76,6 @@ .o_cp_right { display: flex; - margin-top: 5px; > .o_cp_pager { margin: auto 0 auto auto; |