Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed element styles

Browse Source
This commit is contained in:
M66B
2023-06-03 11:00:53 +02:00
parent 3168b5be17
commit a0c1104a66
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@@ -656,7 +656,7 @@ public class HtmlHelper {
String style = processStyles(tag, clazz, null, sheets);
// Element style
style = mergeElementStyles(style, element.attr("style"));
style = mergeStyles(style, element.attr("style"));
if ("fairemail_debug_info".equals(clazz))
style = mergeStyles(style, "font-size: smaller");
@@ -1779,14 +1779,14 @@ public class HtmlHelper {
if (tag == null
? eselector.getLocalName() == null
: tag.equalsIgnoreCase(eselector.getLocalName()))
style = mergeStyles(style, srule.getStyle().getCssText());
style = mergeStyles(style, srule.getStyle().getCssText(), false);
break;
case Selector.SAC_CONDITIONAL_SELECTOR:
ConditionalSelectorImpl cselector = (ConditionalSelectorImpl) selector;
if (cselector.getCondition().getConditionType() == SAC_CLASS_CONDITION) {
ClassConditionImpl ccondition = (ClassConditionImpl) cselector.getCondition();
if (clazz.equalsIgnoreCase(ccondition.getValue()))
style = mergeStyles(style, srule.getStyle().getCssText());
style = mergeStyles(style, srule.getStyle().getCssText(), false);
}
break;
}
@@ -1820,10 +1820,6 @@ public class HtmlHelper {
}
static String mergeStyles(String base, String style) {
return mergeStyles(base, style, false);
}
static String mergeElementStyles(String base, String style) {
return mergeStyles(base, style, true);
}