diff --git a/after/syntax/css/css-cascade-3.vim b/after/syntax/css/css-cascade-3.vim new file mode 100644 index 0000000..909e370 --- /dev/null +++ b/after/syntax/css/css-cascade-3.vim @@ -0,0 +1,3 @@ +" TODO: create cssCommonProp +syn keyword cssFontProp all +syn keyword cssCommonAttr contained initial unset diff --git a/after/syntax/css/css3-cascade.vim b/after/syntax/css/css3-cascade.vim deleted file mode 100644 index 1db38bb..0000000 --- a/after/syntax/css/css3-cascade.vim +++ /dev/null @@ -1,3 +0,0 @@ -" TODO: create cssCascadeProp and cssCascadeAttr -syn keyword cssFontProp all -syn keyword cssFontAttr unset diff --git a/after/syntax/css/css3-values.vim b/after/syntax/css/css3-values.vim index 2e5fc19..8e2e1f6 100644 --- a/after/syntax/css/css3-values.vim +++ b/after/syntax/css/css3-values.vim @@ -3,4 +3,3 @@ syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=turn" " TODO: create cssValueResolution group syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=dp\(i\|cm\|px\)" syn region cssFunction contained matchgroup=cssFunctionName start="\<\(calc\|toggle\)\s*(" end=")" oneline keepend -syn keyword cssCommonAttr contained initial diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 3928300..a5f8871 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -4,7 +4,6 @@ syn include @htmlCss syntax/css/css3-animations.vim syn include @htmlCss syntax/css/css3-background.vim syn include @htmlCss syntax/css/css3-box.vim syn include @htmlCss syntax/css/css3-break.vim -syn include @htmlCss syntax/css/css3-cascade.vim syn include @htmlCss syntax/css/css3-colors.vim syn include @htmlCss syntax/css/css3-conditional.vim syn include @htmlCss syntax/css/css3-content.vim @@ -24,6 +23,7 @@ syn include @htmlCss syntax/css/css3-transitions.vim syn include @htmlCss syntax/css/css3-ui.vim syn include @htmlCss syntax/css/css3-values.vim syn include @htmlCss syntax/css/css-align-3.vim +syn include @htmlCss syntax/css/css-cascade-3.vim syn include @htmlCss syntax/css/css-counter-styles-3.vim syn include @htmlCss syntax/css/css-display-3.vim syn include @htmlCss syntax/css/css-flexbox-1.vim diff --git a/test/test.css b/test/test.css index 2175512..cfbcbd8 100644 --- a/test/test.css +++ b/test/test.css @@ -62,7 +62,8 @@ } .cascade { - all: unset; + all: initial; + display: unset; } .colors { @@ -575,7 +576,6 @@ display: 1dppx; display: calc(100%/3 - 2*1em - 2*1px); display: toggle(italic, normal); - display: initial; } .variables { diff --git a/test/test.html b/test/test.html index 9e9f2cb..2e681fc 100644 --- a/test/test.html +++ b/test/test.html @@ -77,7 +77,8 @@