pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mass_mailing: properly apply nested styles in paragraphs

Browse Source 
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>
This commit is contained in:
Antoine Guenet
2022-04-08 09:40:10 +02:00
parent 989425c576
commit 984ec124f4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/static/src/js/mass_mailing_snippets.js
+2 -2
View File
@@ -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',
},
addons/mass_mailing/views/snippets_themes.xml
+6 -6
View File
@@ -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 -->