forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some css fixes

This commit is contained in:
Adam D. Ruppe 2024-09-24 09:18:33 -04:00
parent 49dee2642b
commit 161d733196
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom.d
View File

@ -7443,7 +7443,8 @@ int intFromHex(string hex) {
break; break;
default: default:
assert(0, token); import arsd.core;
throw ArsdException!"CSS Selector Problem"(token, tokens, cast(int) state);
} }
} }
break; break;
@ -7493,6 +7494,9 @@ int intFromHex(string hex) {
case "root": case "root":
current.rootElement = true; current.rootElement = true;
break; break;
case "lang":
state = State.SkippingFunctionalSelector;
continue;
case "nth-child": case "nth-child":
current.nthChild ~= ParsedNth(readFunctionalSelector()); current.nthChild ~= ParsedNth(readFunctionalSelector());
state = State.SkippingFunctionalSelector; state = State.SkippingFunctionalSelector;
@ -7505,6 +7509,11 @@ int intFromHex(string hex) {
current.nthLastOfType ~= ParsedNth(readFunctionalSelector()); current.nthLastOfType ~= ParsedNth(readFunctionalSelector());
state = State.SkippingFunctionalSelector; state = State.SkippingFunctionalSelector;
continue; continue;
case "nth-last-child":
// FIXME
//current.nthLastOfType ~= ParsedNth(readFunctionalSelector());
state = State.SkippingFunctionalSelector;
continue;
case "is": case "is":
state = State.SkippingFunctionalSelector; state = State.SkippingFunctionalSelector;
current.isSelectors ~= readFunctionalSelector(); current.isSelectors ~= readFunctionalSelector();
@ -7706,6 +7715,7 @@ class CssStyle {
p.specificity = originatingSpecificity; p.specificity = originatingSpecificity;
properties ~= p; properties ~= p;
} }
foreach(property; properties) foreach(property; properties)
@ -7716,8 +7726,19 @@ class CssStyle {
Specificity getSpecificityOfRule(string rule) { Specificity getSpecificityOfRule(string rule) {
Specificity s; Specificity s;
if(rule.length == 0) { // inline if(rule.length == 0) { // inline
// s.important = 2; s.important = 2;
} else { } else {
// SO. WRONG.
foreach(ch; rule) {
if(ch == '.')
s.classes++;
if(ch == '#')
s.ids++;
if(ch == ' ')
s.tags++;
if(ch == ',')
break;
}
// FIXME // FIXME
} }
@ -7782,6 +7803,7 @@ class CssStyle {
if(newSpecificity.score >= property.specificity.score) { if(newSpecificity.score >= property.specificity.score) {
property.givenExplicitly = explicit; property.givenExplicitly = explicit;
expandShortForm(property, newSpecificity); expandShortForm(property, newSpecificity);
property.specificity = newSpecificity;
return (property.value = value); return (property.value = value);
} else { } else {
if(name == "display") if(name == "display")