diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-21 12:18:40 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-21 12:18:40 +0200 |
| commit | 68326b15f90b9b6d421593a85ee23546bd7e0e6d (patch) | |
| tree | 2e60717e7fd29d91b2a75060d9fd6ce053dae9de /addons/web_editor/static/src/js/editor/transcoder.js | |
| parent | 512dab4500c827a54f17802220390f132faf63c4 (diff) | |
| parent | c5ed37297098c48bf6a89a2175127541ad1f5da3 (diff) | |
[MERGE] forward port branch 11.0 up to c5ed3729709
Diffstat (limited to 'addons/web_editor/static/src/js/editor/transcoder.js')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/transcoder.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/editor/transcoder.js b/addons/web_editor/static/src/js/editor/transcoder.js index fb3e69eda29..ebe6fea5dbb 100644 --- a/addons/web_editor/static/src/js/editor/transcoder.js +++ b/addons/web_editor/static/src/js/editor/transcoder.js @@ -277,11 +277,12 @@ function classToStyle($editable) { } // Outlook - if (node.nodeName === 'A' && $target.hasClass('btn') && !$target.children().length) { - var $hack = $('<table class="o_outlook_hack"><tr><td></td></tr></table>'); + if (node.nodeName === 'A' && $target.hasClass('btn') && !$target.hasClass('btn-link') && !$target.children().length) { + var $hack = $('<table class="o_outlook_hack" style="display: inline-table;"><tr><td></td></tr></table>'); $hack.find('td') .attr('height', $target.outerHeight()) .css({ + 'text-align': $target.parent().css('text-align'), 'margin': $target.css('padding'), 'border-radius': $target.css('border-radius'), 'background-color': $target.css('background-color'), |