mirror of https://github.com/M66B/FairEmail.git
Revert "Merge styles for elements only"
This reverts commit 389fa78fa9
.
This commit is contained in:
parent
7bfa680c2b
commit
0da95d1422
|
@ -1795,7 +1795,7 @@ 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:
|
||||
if (!TextUtils.isEmpty(clazz)) {
|
||||
|
@ -1805,7 +1805,7 @@ public class HtmlHelper {
|
|||
String value = ccondition.getValue();
|
||||
for (String cls : clazz.split("\\s+"))
|
||||
if (cls.equalsIgnoreCase(value)) {
|
||||
style = mergeStyles(style, srule.getStyle().getCssText());
|
||||
style = mergeStyles(style, srule.getStyle().getCssText(), false);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1842,6 +1842,10 @@ public class HtmlHelper {
|
|||
}
|
||||
|
||||
static String mergeStyles(String base, String style) {
|
||||
return mergeStyles(base, style, true);
|
||||
}
|
||||
|
||||
private static String mergeStyles(String base, String style, boolean element) {
|
||||
Map<String, String> result = new HashMap<>();
|
||||
|
||||
// Base style
|
||||
|
@ -1873,18 +1877,19 @@ public class HtmlHelper {
|
|||
//https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Cascade_and_inheritance#controlling_inheritance
|
||||
boolean initial = false; // no value
|
||||
boolean inherit = false; // parent value
|
||||
switch (value) {
|
||||
case "inherit":
|
||||
inherit = true;
|
||||
break;
|
||||
case "initial":
|
||||
initial = true;
|
||||
break;
|
||||
case "unset":
|
||||
case "revert":
|
||||
inherit = !STYLE_NO_INHERIT.contains(key);
|
||||
break;
|
||||
}
|
||||
if (element)
|
||||
switch (value) {
|
||||
case "inherit":
|
||||
inherit = true;
|
||||
break;
|
||||
case "initial":
|
||||
initial = true;
|
||||
break;
|
||||
case "unset":
|
||||
case "revert":
|
||||
inherit = !STYLE_NO_INHERIT.contains(key);
|
||||
break;
|
||||
}
|
||||
|
||||
if (initial || inherit)
|
||||
Log.i("CSS " + value + "=" + key);
|
||||
|
@ -1900,7 +1905,8 @@ public class HtmlHelper {
|
|||
}
|
||||
|
||||
for (String key : baseParams.keySet())
|
||||
result.put(key, baseParams.get(key));
|
||||
if (!STYLE_NO_INHERIT.contains(key) || element)
|
||||
result.put(key, baseParams.get(key));
|
||||
|
||||
return TextUtils.join(";", result.values());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue