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) {