diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:20:28 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:20:28 +0100 |
| commit | e00a447e2ca277697bd3e3cae5196e8177d3e867 (patch) | |
| tree | c8580e47f101f75ceccd6ba19f9649b575f99177 /addons/mass_mailing/views | |
| parent | cde120058aa4edd259b7d7e1624465af313710fe (diff) | |
| parent | 7e469eb77aae1f7e05a3ce0f6575b5149fed3ca1 (diff) | |
[MERGE] forward port branch saas-11.1 up to 7e469eb77aa
Diffstat (limited to 'addons/mass_mailing/views')
| -rw-r--r-- | addons/mass_mailing/views/snippets_themes_options.xml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/addons/mass_mailing/views/snippets_themes_options.xml b/addons/mass_mailing/views/snippets_themes_options.xml index 50c40473f12..dd8cdee5a9e 100644 --- a/addons/mass_mailing/views/snippets_themes_options.xml +++ b/addons/mass_mailing/views/snippets_themes_options.xml @@ -6,9 +6,12 @@ <t t-raw="0"/> <div data-js="sizing_x" - data-selector="img, .mv, .col_mv, td:not(.o_mail_no_resize), th"/> + data-selector="img, .mv, .col_mv, td, th" + data-exclude=".o_mail_no_resize, .o_mail_wrapper_td"/> - <div data-js="table_item" data-selector="td, th"/> + <div data-js="table_item" + data-selector="td, th" + data-exclude=".o_mail_wrapper_td"/> <div data-js="table_row" data-selector="tr:has(> .row), tr:has(> .col_mv)" @@ -17,11 +20,13 @@ <div data-js="table_column" data-selector=".col>td, .col>th" + data-exclude=".o_mail_wrapper_td" data-drop-near=".col>td, .col>th"> </div> <div data-js="table_column_mv" data-selector=".col_mv, td, th" + data-exclude=".o_mail_wrapper_td" data-drop-near=".col_mv, td, th"> </div> @@ -32,14 +37,16 @@ </div> <div data-js="sizing_y" - data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td:not(.o_mail_no_resize), th"/> + data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, th" + data-exclude=".o_mail_no_resize, .o_mail_wrapper_td"> <div data-js="colorpicker" data-selector=" - [data-oe-field='body_html'] > div:not(.o_layout):not(.o_mail_no_colorpicker), - [data-oe-field='body_html'] .oe_structure > div:not(.o_mail_no_colorpicker), + [data-oe-field='body_html'] > div:not(.o_layout), + [data-oe-field='body_html'] .oe_structure > div, td, th - "> + " + data-exclude=".o_mail_no_colorpicker"> <li class="dropdown-submenu"> <a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Background Color</a> <ul class="dropdown-menu"> |