diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-08 18:12:03 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-08 18:12:03 +0200 |
| commit | f2e105eeca409e55be0408edcc986b39fd026094 (patch) | |
| tree | 7c5c581d5c2ffe76bcdc3d8278a54fc542390dd9 /odoo/tools | |
| parent | 652e336deb1846a64abb5e2032864d5e17bf03b6 (diff) | |
| parent | d3a040cebe11c30697aebbafeb7d52888d3bff70 (diff) | |
[MERGE] forward port branch saas-15 up to d3a040cebe1
Diffstat (limited to 'odoo/tools')
| -rw-r--r-- | odoo/tools/mail.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py index ce1ccb90e3a..97a3e427a94 100644 --- a/odoo/tools/mail.py +++ b/odoo/tools/mail.py @@ -45,11 +45,12 @@ class _Cleaner(clean.Cleaner): _style_whitelist = [ 'font-size', 'font-family', 'font-weight', 'background-color', 'color', 'text-align', 'line-height', 'letter-spacing', 'text-transform', 'text-decoration', + 'float', 'vertical-align', 'padding', 'padding-top', 'padding-left', 'padding-bottom', 'padding-right', - 'margin', 'margin-top', 'margin-left', 'margin-bottom', 'margin-right' + 'margin', 'margin-top', 'margin-left', 'margin-bottom', 'margin-right', # box model - 'border', 'border-color', 'border-radius', 'border-style', 'height', - 'margin', 'padding', 'width', 'max-width', 'min-width', + 'border', 'border-color', 'border-radius', 'border-style', 'border-width', + 'height', 'margin', 'padding', 'width', 'max-width', 'min-width', # tables 'border-collapse', 'border-spacing', 'caption-side', 'empty-cells', 'table-layout'] |