[MERGE] forward port branch 11.0 up to f96a797fe62

1 files changed, 7 insertions, 17 deletions

diff --git a/addons/web/static/src/less/modal.less b/addons/web/static/src/less/modal.less
index 95a14420773..a223deb55ef 100644
--- a/addons/web/static/src/less/modal.less
+++ b/addons/web/static/src/less/modal.less
@@ -77,21 +77,11 @@
     }
 }
 
-// Change the z-index of the modal-backdrop elements to be equal to the
-// modal elements' ones. Bootstrap does not support multi-modals, and without
-// this rule all the modal-backdrops are below all the opened modals.
-// Indeed, bootstrap forces them to a lower z-index as the modal-backdrop
-// element (unique in their supported cases) might be put after the modal
-// element (if the modal is already in the DOM, hidden, then opened). This
-// cannot happen in odoo though as modals are not hidden but removed from
-// the DOM and are always put at the end of the body when opened.
-//
-// Note that the variable @zindex-modal-background may be renamed/removed in
-// newer versions of bootstrap.
-@zindex-modal-background: @zindex-modal;
-
 // Temporary fix for modals which are not instantiated thanks to the Dialog
-// JS classes (deprecated case) + Frontend.
-:not(body) > .modal {
-    z-index: @zindex-modal-background + 1;
-}
+// JS classes (deprecated case) (see bootstrap_overridden.less) + Frontend.
+//
+// TODO the following code was disabled because it is saas-incompatible
+//
+// :not(body) > .modal {
+//     z-index: @zindex-modal-background + 1;
+// }