Skip to content

Commit c08702b

Browse files
committed
Follow changes in WD-css-align-3-20170906
This changes generalize gap specific properties for flexbox, grid, and multicol. So, move these. See also: http://www.w3.org/TR/2017/WD-css-align-3-20170906/
1 parent ed97cb7 commit c08702b

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
syn match cssFontProp contained "\<\(justify\|align\|place\)-\(self\|content\|items\)\>"
2+
syn match cssFontProp contained "\<\(grid-\)\=\(\(row\|column\)-\)\=gap\>"
23
syn keyword cssFontAttr contained safe unsafe legacy
34
syn match cssFontAttr contained "\<\(self\|flex\)-\(start\|end\)\>"
45
syn match cssFontAttr contained "\<space-\(between\|around\|evenly\)\>"

after/syntax/css/css-grid-1.vim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ syn match cssFontProp contained "\<grid-template\(-\(columns\|rows\|areas\)\)\=\
22
syn match cssFontProp contained "\<grid-auto-\(columns\|rows\|flow\)\>"
33
syn match cssFontProp contained "\<grid-\(row\|column\)\(-\(start\|end\)\)\=\>"
44
syn match cssFontProp contained "\<grid-area\>"
5-
syn match cssFontProp contained "\<grid\(-\(column\|row\)\)\=-gap\>"
65
syn keyword cssFontAttr contained grid dense span
76
syn match cssFontAttr contained "\<inline-grid\>"
87
syn match cssFontAttr contained "\<auto-flow\>"

after/syntax/css/css3-multicol.vim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
" TODO: create cssMulticolProp group and cssMulticolAttr group
21
syn keyword cssFontProp contained columns
3-
syn match cssFontProp contained "\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
2+
syn match cssFontProp contained "\<column-\(count\|fill\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
43
syn keyword cssFontAttr contained balance
54
syn match cssFontAttr contained "\<\(avoid-\)\=column\>"

test/test.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
place-self: space-around;
99
place-content: space-between;
1010
place-items: space-evenly;
11-
display: legacy;
11+
row-gap: legacy;
12+
column-gap: auto;
13+
gap: auto;
14+
grid-column-gap: auto;
15+
grid-row-gap: auto;
16+
grid-gap: auto;
1217
}
1318

1419
.animations {
@@ -370,9 +375,6 @@
370375
grid-column: auto;
371376
grid-row: auto;
372377
grid-area: auto;
373-
grid-column-gap: auto;
374-
grid-row-gap: auto;
375-
grid-gap: auto;
376378
}
377379

378380
.images-3 {
@@ -502,7 +504,6 @@
502504
columns: column;
503505
column-count: balance;
504506
column-fill: avoid-column;
505-
column-gap: auto;
506507
column-rule: auto;
507508
column-rule-color: auto;
508509
column-rule-style: auto;

test/test.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
place-self: space-around;
1919
place-content: space-between;
2020
place-items: space-evenly;
21-
display: legacy;
21+
row-gap: legacy;
22+
column-gap: auto;
23+
gap: auto;
24+
grid-column-gap: auto;
25+
grid-row-gap: auto;
26+
grid-gap: auto;
2227
}
2328
</style>
2429
<style>
@@ -404,9 +409,6 @@
404409
grid-column: auto;
405410
grid-row: auto;
406411
grid-area: auto;
407-
grid-column-gap: auto;
408-
grid-row-gap: auto;
409-
grid-gap: auto;
410412
}
411413
</style>
412414
<style>
@@ -545,7 +547,6 @@
545547
columns: column;
546548
column-count: balance;
547549
column-fill: avoid-column;
548-
column-gap: auto;
549550
column-rule: auto;
550551
column-rule-color: auto;
551552
column-rule-style: auto;

0 commit comments

Comments
 (0)