From 34a8be6642207eac76c0c269ab1a8f08cddad89e Mon Sep 17 00:00:00 2001 From: Kyo Nagashima Date: Fri, 20 May 2016 10:35:26 +0900 Subject: [PATCH] Follow changes in WD-css-sizing-3-20160512 See also:https://www.w3.org/TR/2016/WD-css-sizing-3-20160512/ --- after/syntax/css/css-sizing-3.vim | 1 + after/syntax/css/css3-sizing.vim | 3 --- after/syntax/html.vim | 2 +- test/test.css | 4 +--- test/test.html | 4 +--- 5 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 after/syntax/css/css-sizing-3.vim delete mode 100644 after/syntax/css/css3-sizing.vim diff --git a/after/syntax/css/css-sizing-3.vim b/after/syntax/css/css-sizing-3.vim new file mode 100644 index 0000000..3c2c761 --- /dev/null +++ b/after/syntax/css/css-sizing-3.vim @@ -0,0 +1 @@ +syn match cssFontAttr contained "\<\(\(min\|max\|fit\)-content\)\>" diff --git a/after/syntax/css/css3-sizing.vim b/after/syntax/css/css3-sizing.vim deleted file mode 100644 index 2eb29c9..0000000 --- a/after/syntax/css/css3-sizing.vim +++ /dev/null @@ -1,3 +0,0 @@ -" TODO: create cssSizingAttr group -syn match cssFontAttr contained "\<\(\(min\|max\|fit\)-content\|fill-available\|repudiate-floats\)\>" -syn match cssFontAttr contained "\" diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 5f7fd55..d897ee7 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -22,6 +22,7 @@ syn include @htmlCss syntax/css/css-round-display-1.vim syn include @htmlCss syntax/css/css-ruby-1.vim syn include @htmlCss syntax/css/css-scoping-1.vim syn include @htmlCss syntax/css/css-shapes-1.vim +syn include @htmlCss syntax/css/css-sizing-3.vim syn include @htmlCss syntax/css/css-snappoints-1.vim syn include @htmlCss syntax/css/css-text-3.vim syn include @htmlCss syntax/css/css-text-4.vim @@ -46,7 +47,6 @@ syn include @htmlCss syntax/css/css3-page.vim syn include @htmlCss syntax/css/css3-positioning.vim syn include @htmlCss syntax/css/css3-regions.vim syn include @htmlCss syntax/css/css3-selectors.vim -syn include @htmlCss syntax/css/css3-sizing.vim syn include @htmlCss syntax/css/css3-speech.vim syn include @htmlCss syntax/css/css3-syntax.vim syn include @htmlCss syntax/css/css3-transforms.vim diff --git a/test/test.css b/test/test.css index 4995035..875d8b6 100644 --- a/test/test.css +++ b/test/test.css @@ -531,10 +531,8 @@ .sizing { display: max-content; + display: min-content; display: fit-content; - display: fill-available; - display: repudiate-floats; - display: contain-floats; } .snappoints { diff --git a/test/test.html b/test/test.html index 004a9ed..6054de7 100644 --- a/test/test.html +++ b/test/test.html @@ -585,10 +585,8 @@