From b81a10086d87b1fb9a1a82afc9dd95741c74d144 Mon Sep 17 00:00:00 2001 From: Kyo Nagashima Date: Tue, 6 Mar 2018 11:50:48 +0900 Subject: [PATCH] Follow changes in WD-css-sizing-3-20180304 See also: http://www.w3.org/TR/2018/WD-css-sizing-3-20180304/ This commit also moves `fit-content()` from `css-grid-1.vim`. --- after/syntax/css/css-grid-1.vim | 2 +- after/syntax/css/css-sizing-3.vim | 3 ++- test/test.css | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/after/syntax/css/css-grid-1.vim b/after/syntax/css/css-grid-1.vim index fd1830d..22ed79b 100644 --- a/after/syntax/css/css-grid-1.vim +++ b/after/syntax/css/css-grid-1.vim @@ -6,4 +6,4 @@ syn keyword cssFontAttr contained grid dense span syn match cssFontAttr contained "\" syn match cssFontAttr contained "\" syn match cssValueNumber contained "[01]\(.\d\+\)\=fr" -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(minmax\|fit-content\|repeat\)\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(minmax\|repeat\)\s*(" end=")" oneline keepend diff --git a/after/syntax/css/css-sizing-3.vim b/after/syntax/css/css-sizing-3.vim index 3c2c761..4dd6b68 100644 --- a/after/syntax/css/css-sizing-3.vim +++ b/after/syntax/css/css-sizing-3.vim @@ -1 +1,2 @@ -syn match cssFontAttr contained "\<\(\(min\|max\|fit\)-content\)\>" +syn match cssFontAttr contained "\<\(\(min\|max\)-content\)\>" +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(fit-content\)\s*(" end=")" oneline keepend diff --git a/test/test.css b/test/test.css index 41dcdbf..2ea8b56 100644 --- a/test/test.css +++ b/test/test.css @@ -360,7 +360,7 @@ grid-template-columns: grid; grid-template-rows: inline-grid; grid-template-areas: minmax(0, 1); - grid-template: fit-content(10%); + grid-template: auto; grid-auto-rows: repeat(4); grid-auto-columns: 0.2fr; grid-auto-flow: dense; @@ -712,7 +712,7 @@ .sizing-3 { display: max-content; display: min-content; - display: fit-content; + display: fit-content(10%); } .speech {