From 984ec124f4c848a422f876533fb4d862686d43f6 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Tue, 5 Apr 2022 13:24:44 +0000
Subject: [PATCH] [FIX] mass_mailing: properly apply nested styles in
 paragraphs

Inline styles applied by the editor should always have priority over the
general stylesheet. This failed in the case of nested styles (a <font>
with a color within a <span> with a font size for instance).

closes odoo/odoo#88004

Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../static/src/js/mass_mailing_snippets.js           |  4 ++--
 addons/mass_mailing/views/snippets_themes.xml        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mass_mailing/static/src/js/mass_mailing_snippets.js b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
index 31e7541b96f..75b53d34a3c 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
@@ -40,8 +40,8 @@ const DEFAULT_CSS_OBJECT = {
         color: '#212529',
         'font-family': 'Arial,Helvetica Neue,Helvetica,sans-serif',
     },
-    'p, p *, li, li *': {
-        'font-size': '14x',
+    'p, p > *, li, li > *': {
+        'font-size': '14px',
         color: '#212529',
         'font-family': 'Arial,Helvetica Neue,Helvetica,sans-serif',
     },
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index b4461bb5c50..cc52330fcf8 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -629,28 +629,28 @@
         <we-row string="Text" class="o_design_tab_title">
             <we-input data-customize-css-property=""
                         data-css-property="font-size"
-                        data-selector-text="p, p *, li, li *"
+                        data-selector-text="p, p > *, li, li > *"
                         data-unit="px"/>
             <we-colorpicker data-customize-css-property=""
                             data-css-property="color"
-                            data-selector-text="p, p *, li, li *"
+                            data-selector-text="p, p > *, li, li > *"
                             data-no-transparency="true"
                             data-color-prefix="text-"/>
         </we-row>
         <we-row string="⌙ " class="o_short_title">
-            <we-fontfamilypicker data-selector-text="p, p *, li, li *"/>
+            <we-fontfamilypicker data-selector-text="p, p > *, li, li > *"/>
             <span>​</span> <!-- Separate the select from the buttons (styling) -->
             <we-button title="Bold" class="fa fa-fw fa-bold" data-no-preview="true" data-toggle="true"
                         data-customize-css-property="bolder"
-                        data-selector-text="p, p *, li, li *"
+                        data-selector-text="p, p > *, li, li > *"
                         data-css-property="font-weight"/>
             <we-button title="Italic" class="fa fa-fw fa-italic" data-no-preview="true" data-toggle="true"
                         data-customize-css-property="italic"
-                        data-selector-text="p, p *, li, li *"
+                        data-selector-text="p, p > *, li, li > *"
                         data-css-property="font-style"/>
             <we-button title="Underline" class="fa fa-fw fa-underline" data-no-preview="true" data-toggle="true"
                         data-customize-css-property="underline"
-                        data-selector-text="p, p *, li, li *"
+                        data-selector-text="p, p > *, li, li > *"
                         data-css-property="text-decoration-line"/>
         </we-row>
         <!-- LINKS -->