From cb9f1b3f705e3c83598366f06f992765ea05434b Mon Sep 17 00:00:00 2001 From: Kyo Nagashima Date: Fri, 6 Jun 2014 02:10:59 +0900 Subject: [PATCH] Support css3-conditional properly --- after/syntax/css/css3-conditional.vim | 2 +- after/syntax/html.vim | 2 +- test/test.css | 16 ++++++++-------- test/test.html | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/after/syntax/css/css3-conditional.vim b/after/syntax/css/css3-conditional.vim index f22fba7..9bb5c3e 100644 --- a/after/syntax/css/css3-conditional.vim +++ b/after/syntax/css/css3-conditional.vim @@ -1 +1 @@ -syn region cssInclude start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaType,cssMediaKeyword nextgroup=cssMediaBlock +syn region cssInclude start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 80e2994..4c49740 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -7,7 +7,7 @@ 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-conditional.vim syn include @htmlCss syntax/css/css3-content.vim syn include @htmlCss syntax/css/css3-exclusions.vim syn include @htmlCss syntax/css/css3-fonts.vim diff --git a/test/test.css b/test/test.css index 02609b7..7e7902f 100644 --- a/test/test.css +++ b/test/test.css @@ -71,6 +71,14 @@ display: currentColor; } +@supports (display: auto) or + (display: auto) not + (display: auto) { + .conditional { + display: auto; + } +} + .compositing { mix-blend-mode: multiply; isolation: screen; @@ -453,14 +461,6 @@ display: reduced; } -@supports (display: auto) or - (display: auto) not - (display: auto) { - .supports { - display: auto; - } -} - .text { hyphens: manual; line-break: loose; diff --git a/test/test.html b/test/test.html index a28ee7e..34f85cb 100644 --- a/test/test.html +++ b/test/test.html @@ -81,6 +81,14 @@ display: currentColor; } + @supports (display: auto) or + (display: auto) not + (display: auto) { + .conditional { + display: auto; + } + } + .compositing { mix-blend-mode: multiply; isolation: screen; @@ -462,14 +470,6 @@ display: reduced; } - @supports (display: auto) or - (display: auto) not - (display: auto) { - .supports { - display: auto; - } - } - .text { hyphens: manual; line-break: loose;