Skip to content

Commit edf5147

Browse files
committed
Follow changes in WD-css-multicol-1-20171005
This module renamed from `css3-multicol` to `css-multicol-1`. See also: http://www.w3.org/TR/2017/WD-css-multicol-1-20171005/
1 parent a552f6b commit edf5147

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

after/syntax/css/css-break-3.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
syn match cssFontProp contained "\<break-\(after\|before\|inside\)\>"
22
syn match cssFontProp contained "\<box-decoration-break\>"
3+
syn match cssFontAttr contained "\<\(avoid-\)\=column\>"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
syn keyword cssFontProp contained columns
22
syn match cssFontProp contained "\<column-\(count\|fill\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
3-
syn keyword cssFontAttr contained balance
4-
syn match cssFontAttr contained "\<\(avoid-\)\=column\>"
3+
syn match cssFontAttr contained "\<balance\(-all\)\=\>"

after/syntax/html.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ syn include @htmlCss syntax/css/css-line-grid-1.vim
2222
syn include @htmlCss syntax/css/css-lists-3.vim
2323
syn include @htmlCss syntax/css/css-logical-1.vim
2424
syn include @htmlCss syntax/css/css-masking-1.vim
25+
syn include @htmlCss syntax/css/css-multicol-1.vim
2526
syn include @htmlCss syntax/css/css-overflow-3.vim
2627
syn include @htmlCss syntax/css/css-overflow-4.vim
2728
syn include @htmlCss syntax/css/css-page-floats-3.vim
@@ -58,7 +59,6 @@ syn include @htmlCss syntax/css/css3-color.vim
5859
syn include @htmlCss syntax/css/css3-conditional.vim
5960
syn include @htmlCss syntax/css/css3-exclusions.vim
6061
syn include @htmlCss syntax/css/css3-images.vim
61-
syn include @htmlCss syntax/css/css3-multicol.vim
6262
syn include @htmlCss syntax/css/css3-namespace.vim
6363
syn include @htmlCss syntax/css/css3-page.vim
6464
syn include @htmlCss syntax/css/css3-speech.vim

test/test.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
}
7777

7878
.break-3 {
79-
break-after: auto;
79+
break-after: avoid-column;
8080
break-before: auto;
8181
break-inside: auto;
8282
box-decoration-break: auto;
@@ -500,10 +500,10 @@
500500
offset: auto;
501501
}
502502

503-
.multicol {
503+
.multicol-1 {
504504
columns: column;
505505
column-count: balance;
506-
column-fill: avoid-column;
506+
column-fill: balance-all;
507507
column-rule: auto;
508508
column-rule-color: auto;
509509
column-rule-style: auto;

test/test.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</style>
9292
<style>
9393
.break-3 {
94-
break-after: auto;
94+
break-after: avoid-column;
9595
break-before: auto;
9696
break-inside: auto;
9797
box-decoration-break: auto;
@@ -543,10 +543,10 @@
543543
}
544544
</style>
545545
<style>
546-
.multicol {
546+
.multicol-1 {
547547
columns: column;
548548
column-count: balance;
549-
column-fill: avoid-column;
549+
column-fill: balance-all;
550550
column-rule: auto;
551551
column-rule-color: auto;
552552
column-rule-style: auto;

0 commit comments

Comments
 (0)