[MERGE] Forward-port 9.0 up to 9a3e9291ffa1509f4afa0f35f9d8d71b6e0932d1

4 files changed, 4 insertions, 36 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 7551c531b67..4d946d1b7fa 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -589,7 +589,7 @@ ul.oe_menu_editor .disclose {
 }
 
 #theme_customize_modal {
-  overflow: visible;
+  overflow: auto;
   z-index: 1020;
   background: transparent;
   display: block;
@@ -655,11 +655,3 @@ ul.oe_menu_editor .disclose {
   position: absolute;
   z-index: 1;
 }
-
-/* ---- force the browse to re-compute the stylesheets ---- */
-body.theme_customize_css_loading {
-  magin-top: 1px;
-}
-body.theme_customize_css_loading #wrapwrap {
-  magin-top: -1px;
-}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index df617c7aa24..e4bc4631ad7 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -508,7 +508,7 @@ $infobar_height: 20px
 #theme_error
     background: #ffc
 #theme_customize_modal
-    overflow: visible
+    overflow: auto
     z-index: 1020
     background: transparent
     display: block
@@ -565,11 +565,3 @@ $infobar_height: 20px
             opacity: 0.3
             position: absolute
             z-index: 1
-
-/* ---- force the browse to re-compute the stylesheets ---- */
-body.theme_customize_css_loading
-    magin-top: 1px
-    #wrapwrap
-        magin-top: -1px
-
-// }}}
diff --git a/addons/website/static/src/css/website.editor.css b/addons/website/static/src/css/website.editor.css
index 69e6e451d6b..f1436929da1 100644
--- a/addons/website/static/src/css/website.editor.css
+++ b/addons/website/static/src/css/website.editor.css
@@ -187,7 +187,7 @@
 }
 
 #theme_customize_modal {
-  overflow: visible;
+  overflow: auto;
   z-index: 1020;
   background: transparent;
   display: block;
@@ -253,11 +253,3 @@
   position: absolute;
   z-index: 1;
 }
-
-/* ---- force the browse to re-compute the stylesheets ---- */
-body.theme_customize_css_loading {
-  magin-top: 1px;
-}
-body.theme_customize_css_loading #wrapwrap {
-  magin-top: -1px;
-}
diff --git a/addons/website/static/src/css/website.editor.sass b/addons/website/static/src/css/website.editor.sass
index 911631bb8ee..b7d2d28edda 100644
--- a/addons/website/static/src/css/website.editor.sass
+++ b/addons/website/static/src/css/website.editor.sass
@@ -167,7 +167,7 @@ $infobar_height: 20px
 #theme_error
     background: #ffc
 #theme_customize_modal
-    overflow: visible
+    overflow: auto
     z-index: 1020
     background: transparent
     display: block
@@ -224,11 +224,3 @@ $infobar_height: 20px
             opacity: 0.3
             position: absolute
             z-index: 1
-
-/* ---- force the browse to re-compute the stylesheets ---- */
-body.theme_customize_css_loading
-    magin-top: 1px
-    #wrapwrap
-        magin-top: -1px
-
-// }}}