diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-14 16:34:13 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-14 16:34:13 +0100 |
| commit | d24bdbde81be971be27e39ef7a2e1a1b2371074e (patch) | |
| tree | 5c1cc64cf0fadcf1879ef10f233a3793c47b6bfb /addons/mass_mailing/static/src | |
| parent | 33e7c8d60c58c98d2f679b66abae5af7ef224726 (diff) | |
| parent | 9d0de6111471860bc541058be351df4abb8ea167 (diff) | |
[MERGE] forward port branch saas-14 up to 9d0de611147
Diffstat (limited to 'addons/mass_mailing/static/src')
| -rw-r--r-- | addons/mass_mailing/static/src/js/mass_mailing_editor.js | 4 | ||||
| -rw-r--r-- | addons/mass_mailing/static/src/less/themes/theme_default.less | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js index 70a50131706..da51c1d322d 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js @@ -87,11 +87,11 @@ options.registry["width-x"] = options.Class.extend({ }); options.registry.table_item = options.Class.extend({ - on_clone: function ($clone) { + on_clone: function ($clone, options) { this._super.apply(this, arguments); // If we cloned a td or th element... - if (this.$target.is("td, th")) { + if (options.isCurrent && this.$target.is("td, th")) { // ... and that the td or th element was alone on its row ... if (this.$target.siblings().length === 1) { var $tr = $clone.parent(); diff --git a/addons/mass_mailing/static/src/less/themes/theme_default.less b/addons/mass_mailing/static/src/less/themes/theme_default.less index adfa4bba5ce..3bde380c89d 100644 --- a/addons/mass_mailing/static/src/less/themes/theme_default.less +++ b/addons/mass_mailing/static/src/less/themes/theme_default.less @@ -46,6 +46,11 @@ background-color: @o_mm_def_color_alpha; } +td { + // Default browser style but needed so that alignment works on some mail + // clients (see transcoder) + text-align: inherit; +} // ===== Layout ===== .o_layout { |