Follow CR-css-cascade-3-20150416

This commit also moves `initial` keyword to `css-cascade-3.vim`. See also: http://www.w3.org/TR/2015/CR-css-cascade-3-20150416/
hail2u · Apr 16, 2015 · 8feb345 · 8feb345
1 parent f8db58b
commit 8feb345
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/after/syntax/css/css-cascade-3.vim 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
diff --git 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
@@ -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
@@ -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
@@ -77,7 +77,8 @@
 </style>
 <style>
 .cascade {
-  all: unset;
+  all: initial;
+  display: unset;
 }
 </style>
 <style>
@@ -628,7 +629,6 @@
   display: 1dppx;
   display: calc(100%/3 - 2*1em - 2*1px);
   display: toggle(italic, normal);
-  display: initial;
 }
 </style>
 <style>