From e4866f830e95886050e3a7b5bf781104d9cb8d07 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 21 Sep 2015 11:07:27 +0200
Subject: [PATCH] [FIX] mass_mailing: remove the wrong scrollbar in html field

Add "web_editor_inside_iframe" id in web_editor iframe template to apply css style only when the field is in html field.
Remove "content" css media query in iframe editor to remove scrollbar.
---
 addons/mass_mailing/static/src/css/mass_mailing_popup.css | 3 +++
 addons/web_editor/views/iframe.xml                        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing/static/src/css/mass_mailing_popup.css b/addons/mass_mailing/static/src/css/mass_mailing_popup.css
index 9a81138b9c1..688c469228b 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing_popup.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing_popup.css
@@ -172,6 +172,9 @@ fieldset[disabled] #o_newsletter_popup .btn.btn-success.active {
   background: linear-gradient(135deg, rgba(255, 255, 255, 0.3) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 0) 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#00ffffff', GradientType=1);
 }
+#web_editor_inside_iframe #o_newsletter_popup .o_popup_modal_content:before {
+  content: none;
+}
 #o_newsletter_popup .o_popup_modal_content .o_popup_modal_header {
   background: #6c1153;
   padding: 5px;
diff --git a/addons/web_editor/views/iframe.xml b/addons/web_editor/views/iframe.xml
index 32cbebd30ed..5e51346e7b4 100644
--- a/addons/web_editor/views/iframe.xml
+++ b/addons/web_editor/views/iframe.xml
@@ -42,7 +42,7 @@
             </script>
             <t t-raw="head or ''"/>
         </head>
-        <body onload="var fn=window.top.odoo &amp;&amp; window.top.odoo[callback+'_content']; if(fn) {fn();} else {console.warn('Please don\'t open iframe without the odoo backend');}">
+        <body id="web_editor_inside_iframe" onload="var fn=window.top.odoo &amp;&amp; window.top.odoo[callback+'_content']; if(fn) {fn();} else {console.warn('Please don\'t open iframe without the odoo backend');}">
             <div id="wrapwrap">
                 <main>
                     <t t-raw="0"/>