summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src
diff options
context:
space:
mode:
authorjvm-odoo <jvm@odoo.com>2020-03-20 07:28:42 +0000
committerjvm-odoo <jvm@odoo.com>2020-03-27 11:52:00 +0000
commitf9bf408a827fa86323bc2d1891cb5173b4781e7b (patch)
treef81c39bd4b7e826e971ec181c08794a41ebea14e /addons/web_editor/static/src
parent8e44b395707ec54a057388516f9a7fdbc54c0dfb (diff)
[FIX] web_editor: fix snippets shown in codeview
Issue - Install Mass Mailing - Activate debug mode - Create a mass mailing - Select any template - Go in codeview The snippets hide a part of the code Cause When toggling the codeview, we apply a position absolute (all to 0) which shift the #wrapwrap Solution Add an intermediary parent and apply position relative to #wrapwrap like in 12.0 OPW-2220639 closes odoo/odoo#48496 X-original-commit: e415cffa2ffb3fe4b5f0e32bd96b3433387a95e3 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com> Signed-off-by: Jason Van Malder (jvm) <jvm@odoo.com>
Diffstat (limited to 'addons/web_editor/static/src')
-rw-r--r--addons/web_editor/static/src/scss/wysiwyg_iframe.scss10
-rw-r--r--addons/web_editor/static/src/xml/wysiwyg.xml4
2 files changed, 12 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/scss/wysiwyg_iframe.scss b/addons/web_editor/static/src/scss/wysiwyg_iframe.scss
index e7554317994..5eab0815225 100644
--- a/addons/web_editor/static/src/scss/wysiwyg_iframe.scss
+++ b/addons/web_editor/static/src/scss/wysiwyg_iframe.scss
@@ -20,4 +20,12 @@ body.o_in_iframe {
.note-statusbar {
display: none;
}
-}
+
+ #wrapwrap {
+ position: relative;
+ display: table;
+ table-layout: fixed;
+ width: 100%;
+ height: 100%;
+ }
+} \ No newline at end of file
diff --git a/addons/web_editor/static/src/xml/wysiwyg.xml b/addons/web_editor/static/src/xml/wysiwyg.xml
index f48f2474672..9ede2572a87 100644
--- a/addons/web_editor/static/src/xml/wysiwyg.xml
+++ b/addons/web_editor/static/src/xml/wysiwyg.xml
@@ -45,7 +45,9 @@
<body id="iframe_target" class="o_in_iframe">
<div id="web_editor-top-edit"></div>
<div id="wrapwrap">
- <div data-oe-model="model" data-oe-type="html" class="o_editable oe_structure"></div>
+ <main>
+ <div data-oe-model="model" data-oe-type="html" class="o_editable oe_structure"></div>
+ </main>
</div>
<script type="text/javascript">
odoo.define('web_editor.wysiwyg.iniframe', function (require) {