From 8db441a283a2961e3df22d26cbba405916a6cc83 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Tue, 2 Aug 2022 12:37:37 +0000 Subject: [PATCH] [IMP] mass_mailing: improve theme_default and default SCSS In previous versions of templates, all the styles were needed in every template in ``. This is no longer the case and it has been cleaned up to only use the styles that differ from the "default" ones found in the `mass_mailing_design_constants.js` file. There was a priority problem (ex: `a.btn` inside `p` takes `p`'s text color instead of `.btn`), this is resolved by placing the default styling in `theme_default.css` `theme_default.scss` contained classes that were no longer necessary or would override styles from the builder. These have been removed from the SCSS file and from snippets and templates where these were applied. If the styles are needed, they should be added as inline styles. The theme_default template was calling snippets with `t-call` which prevented customization of the theme. Snippets have been added in full with further customization. task-2835454 Part-of: odoo/odoo#95940 --- .../data/mailing_data_templates.xml | 4 +- .../mass_mailing/data/mass_mailing_demo.xml | 10 +-- .../theme_default/s_default_image_logo.png | Bin 1046 -> 3808 bytes .../src/img/theme_default/signature.png | Bin 0 -> 8385 bytes .../img/theme_imgs/default_thumb_large.png | Bin 17035 -> 13581 bytes .../img/theme_imgs/default_thumb_small.png | Bin 3058 -> 2982 bytes .../static/src/scss/themes/theme_default.scss | 68 +++++++++--------- .../views/snippets/s_text_highlight.xml | 2 +- addons/mass_mailing/views/snippets_themes.xml | 24 +++---- .../mass_mailing/views/themes_templates.xml | 55 ++++++++------ .../views/mass_mailing_themes_templates.xml | 26 +++---- 11 files changed, 99 insertions(+), 90 deletions(-) create mode 100644 addons/mass_mailing/static/src/img/theme_default/signature.png diff --git a/addons/mass_mailing/data/mailing_data_templates.xml b/addons/mass_mailing/data/mailing_data_templates.xml index d35942f293c..7bfe1074532 100644 --- a/addons/mass_mailing/data/mailing_data_templates.xml +++ b/addons/mass_mailing/data/mailing_data_templates.xml @@ -61,7 +61,7 @@ text-decoration: none; } @media screen and (max-width: 768px) { - .o_mail_table_styles { + .o_mail_snippet_general .container { width: 100% !important; } .s_header_social table td, .s_header_text_social table td, .s_header_logo table td, @@ -103,7 +103,7 @@

Don't forget to send your preferred version - Since the date and time for this test has not been scheduled, don't forget to manually send your preferred version. + Since the date and time for this test has not been scheduled, don't forget to manually send your preferred version. Then on the having the will be sent to the remaining % of recipients. diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 3cd4458008c..b99e4d0ec60 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -92,7 +92,7 @@