From ef41ffbb45b7e740b00148959cf5b6348e1c65c0 Mon Sep 17 00:00:00 2001 From: "Rodopho Cammarosano de Lima (rcdl)" Date: Wed, 16 Nov 2022 13:57:08 +0000 Subject: [PATCH] [FIX] web_editor: update z-index in CSS classes Due to a change in Bootstrap, the tablepicker, the toolbar and the q-web branching selector were hidden by modal dialogs. In Odoo 15.0, the included Bootstrap version was 4.3.1, in which .modal's z-index is set at 1050. In Odoo 16.0, the included Bootstrap version is 5.1.3, in which .modal's z-index is set at 1055. Therefore, the previous z-index value of 1051 is now updated to 1056. task# 3002456 closes odoo/odoo#107431 X-original-commit: 263137bcd38f788ff96d13d0810df4da13b72a19 Signed-off-by: David Monjoie (dmo) --- .../static/src/js/editor/odoo-editor/src/style.scss | 4 +++- addons/web_editor/static/src/scss/web_editor.common.scss | 4 +++- addons/web_editor/static/src/scss/wysiwyg.scss | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/src/style.scss b/addons/web_editor/static/src/js/editor/odoo-editor/src/style.scss index b58eb6f583a..88c4e8531e5 100644 --- a/addons/web_editor/static/src/js/editor/odoo-editor/src/style.scss +++ b/addons/web_editor/static/src/js/editor/odoo-editor/src/style.scss @@ -228,7 +228,9 @@ } .oe-tablepicker-wrapper.oe-floating { padding: 3px; - z-index: 1051; + // Bootstrap sets .modal z-index at 1055. + // Ensure tablepicker is visible in modals. + z-index: 1056; background-color: var(--oeTablepicker__wrapper-bg, $o-white); } .oe-tablepicker-row { diff --git a/addons/web_editor/static/src/scss/web_editor.common.scss b/addons/web_editor/static/src/scss/web_editor.common.scss index 360291ad408..2c5380f6462 100644 --- a/addons/web_editor/static/src/scss/web_editor.common.scss +++ b/addons/web_editor/static/src/scss/web_editor.common.scss @@ -953,7 +953,9 @@ section, .oe_img_bg, [data-oe-shape-data] { .oe-qweb-select { position: absolute; - z-index: 1051; + // Bootstrap sets .modal z-index at 1055. + // Ensure qweb-select is visible in modals. + z-index: 1056; background-color: white; } diff --git a/addons/web_editor/static/src/scss/wysiwyg.scss b/addons/web_editor/static/src/scss/wysiwyg.scss index 2178081299b..c5af1a83053 100644 --- a/addons/web_editor/static/src/scss/wysiwyg.scss +++ b/addons/web_editor/static/src/scss/wysiwyg.scss @@ -398,9 +398,9 @@ $o-we-zindex: $o-we-overlay-zindex + 1 !default; body:not(.editor_has_snippets) { .oe-toolbar { - // Bootstrap sets .modal z-index at 1050. Ensure toolbar is visible in + // Bootstrap sets .modal z-index at 1055. Ensure toolbar is visible in // modals. Only apply this to the toolbar if it's not in a snippets menu. - z-index: 1051; + z-index: 1056; } } @media only screen and (max-width: 767px) {