From 9cfb3270a460cbc37d5860bc70221ef8ebb3012c Mon Sep 17 00:00:00 2001 From: Romeo Fragomeli Date: Wed, 1 Jun 2022 12:08:08 +0000 Subject: [PATCH] [FIX] *: wrong usage of media-breakpoint-between It seems louche to use media-breakpoint-between(lg, xl, $o-extra-grid-breakpoints) as in $o-extra-grid-breakpoints there is an XXL value. In short, in XXL mode the padding fallback to the value outside the breakpoint (twice smaller). e.g. result in CSS ```css .o_form_view .o_form_sheet_bg > .o_form_sheet { padding-right: 16px; padding-left: 16px; } @media (min-width: 992px) and (max-width: 1533.98px) { .o_form_view .o_form_sheet_bg > .o_form_sheet { padding-right: 32px; } } @media (min-width: 992px) and (max-width: 1533.98px) { .o_form_view .o_form_sheet_bg > .o_form_sheet { padding-left: 32px; } } ``` Part-of: odoo/odoo#95450 --- addons/hr_holidays/static/src/scss/accrual_plan_level.scss | 2 +- addons/mass_mailing/static/src/scss/mass_mailing.scss | 2 +- addons/web/static/src/legacy/scss/form_view.scss | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/hr_holidays/static/src/scss/accrual_plan_level.scss b/addons/hr_holidays/static/src/scss/accrual_plan_level.scss index b9c293d1034..3264dd86276 100644 --- a/addons/hr_holidays/static/src/scss/accrual_plan_level.scss +++ b/addons/hr_holidays/static/src/scss/accrual_plan_level.scss @@ -3,7 +3,7 @@ $o-hr-holidays-border-color: gray('300'); .o_hr_holidays_hierarchy { margin-left: -$o-horizontal-padding; margin-right: -$o-horizontal-padding; - @include media-breakpoint-between(lg, xl, $o-extra-grid-breakpoints) { + @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) { margin-left: -$o-horizontal-padding*2; margin-right: -$o-horizontal-padding*2; } diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.scss b/addons/mass_mailing/static/src/scss/mass_mailing.scss index b3146a7d1c0..d6aad63d21c 100644 --- a/addons/mass_mailing/static/src/scss/mass_mailing.scss +++ b/addons/mass_mailing/static/src/scss/mass_mailing.scss @@ -13,7 +13,7 @@ } } -@include media-breakpoint-between(lg, xl, $o-extra-grid-breakpoints) { +@include media-breakpoint-up(lg, $o-extra-grid-breakpoints) { .o_form_view .o_form_sheet .o_notebook .tab-content .tab-pane .o_mail_body { // cancel the padding of the form_sheet when breakpoints are reached margin-left: -$o-sheet-cancel-hpadding*2; diff --git a/addons/web/static/src/legacy/scss/form_view.scss b/addons/web/static/src/legacy/scss/form_view.scss index 8dc92744c1a..0f2eb3af5ec 100644 --- a/addons/web/static/src/legacy/scss/form_view.scss +++ b/addons/web/static/src/legacy/scss/form_view.scss @@ -1,7 +1,7 @@ // Define left and right padding according to screen resolution @mixin o-form-sheet-inner-left-padding { padding-left: $o-horizontal-padding; - @include media-breakpoint-between(lg, xl, $o-extra-grid-breakpoints) { + @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) { padding-left: $o-horizontal-padding*2; } } @@ -10,7 +10,7 @@ } @mixin o-form-sheet-inner-right-padding { padding-right: $o-horizontal-padding; - @include media-breakpoint-between(lg, xl, $o-extra-grid-breakpoints) { + @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) { padding-right: $o-horizontal-padding*2; } } @@ -18,7 +18,7 @@ @mixin o-form-sheet-negative-margin { margin-left: -$o-horizontal-padding; margin-right: -$o-horizontal-padding; - @include media-breakpoint-between(lg, xl, $o-extra-grid-breakpoints) { + @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) { margin-left: -$o-horizontal-padding*2; margin-right: -$o-horizontal-padding*2; }