From d499779e7e9733fd085fd2adbd42287da56e2f20 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 10 Oct 2019 15:09:42 +0000
Subject: [PATCH] [FIX] website_mass_mailing, *: fix display of backend popup
 edition

In the backend, when a mailing popup was being edited, it was not
centered in the edition area (and went under the editor UI) and was not
using the correct style.

task-2083465

closes odoo/odoo#38449

X-original-commit: 6ccf3b618b4b0774deccb4f75bf33f3ea4dc8b75
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 addons/web_editor/static/src/scss/wysiwyg.scss   | 16 ++++++++++++++++
 .../static/src/scss/website.edit_mode.scss       | 16 ----------------
 .../static/src/xml/website_mass_mailing.xml      |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/web_editor/static/src/scss/wysiwyg.scss b/addons/web_editor/static/src/scss/wysiwyg.scss
index db5db858727..f47cb99b055 100644
--- a/addons/web_editor/static/src/scss/wysiwyg.scss
+++ b/addons/web_editor/static/src/scss/wysiwyg.scss
@@ -429,3 +429,19 @@ img.o_we_custom_image.mx-auto {
         }
     }
 }
+
+// User modal in edit mode
+.editor_enable, .note-editable {
+    .modal:not(.o_technical_modal) {
+        top: 40px;
+        right: 0;
+        bottom: 0;
+        left: $o-we-sidebar-width;
+        width: auto;
+        height: auto;
+
+        .modal-dialog {
+            padding: 0.5rem 0; // To use more editor space if necessary
+        }
+    }
+}
diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss
index 5693f6e7526..c019975249f 100644
--- a/addons/website/static/src/scss/website.edit_mode.scss
+++ b/addons/website/static/src/scss/website.edit_mode.scss
@@ -136,19 +136,3 @@ table.editorbar-panel {
         cursor: pointer;
     }
 }
-
-// User modal in edit mode
-.editor_enable, .note-editable {
-    .modal:not(.o_technical_modal) {
-        top: 40px;
-        right: 0;
-        bottom: 0;
-        left: $o-we-sidebar-width;
-        width: auto;
-        height: auto;
-
-        .modal-dialog {
-            padding: 0.5rem 0; // To use more editor space if necessary
-        }
-    }
-}
diff --git a/addons/website_mass_mailing/static/src/xml/website_mass_mailing.xml b/addons/website_mass_mailing/static/src/xml/website_mass_mailing.xml
index d816d899fe8..9fd80fe5e77 100644
--- a/addons/website_mass_mailing/static/src/xml/website_mass_mailing.xml
+++ b/addons/website_mass_mailing/static/src/xml/website_mass_mailing.xml
@@ -4,10 +4,10 @@
     <div class="modal fade show d-block o_newsletter_modal">
         <div role="dialog" class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
-                <header>
+                <header class="modal-header">
                     <button type="button" class="close" aria-label="Close" tabindex="-1">×</button>
                 </header>
-                <div id="wrapper" class="modal-body oe_structure"></div>
+                <div id="wrapper" class="modal-body p-0 oe_structure oe_empty"></div>
             </div>
         </div>
     </div>