Skip to content

Commit f2ddc7b

Browse files
kbabbittchromium-wpt-export-bot
authored andcommitted
Rename gap-rule-overlap to rule-overlap
Per CSSWG resolution: w3c/csswg-drafts#12540 Bug: 357648037 Change-Id: I47a615951b82c10b7c1b22d58bfbec6e14eac3c5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7547470 Reviewed-by: Javier Contreras <javiercon@microsoft.com> Reviewed-by: Fredrik Söderquist <fs@opera.com> Commit-Queue: Kevin Babbitt <kbabbitt@microsoft.com> Cr-Commit-Position: refs/heads/main@{#1580966}
1 parent 9b1f66c commit f2ddc7b

11 files changed

+24
-24
lines changed

css/css-gaps/flex/flex-gap-decorations-012.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
column-rule-style: solid;
2222
column-rule-color: red;
2323
column-rule-width: 2px;
24-
gap-rule-overlap: column-over-row;
24+
rule-overlap: column-over-row;
2525
width: 170px;
2626
flex-wrap: wrap;
2727
}

css/css-gaps/flex/flex-gap-decorations-015.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
row-rule-style: solid;
2626
row-rule-color: blue;
2727
row-rule-width: 10px;
28-
gap-rule-overlap: column-over-row;
28+
rule-overlap: column-over-row;
2929
}
3030

3131
.items {

css/css-gaps/flex/flex-gap-decorations-016.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
row-rule-style: solid;
2626
row-rule-color: blue;
2727
row-rule-width: 10px;
28-
gap-rule-overlap: column-over-row;
28+
rule-overlap: column-over-row;
2929
}
3030

3131
.items {

css/css-gaps/grid/grid-gap-decorations-023.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
row-rule-width: 5px;
2626
column-rule-break: none;
2727
row-rule-break: none;
28-
gap-rule-overlap: column-over-row;
28+
rule-overlap: column-over-row;
2929
}
3030
.grid-item {
3131
background-color: gray;

css/css-gaps/grid/subgrid/subgrid-gap-decorations-017.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
column-rule: skyblue solid 10px;
2323
row-rule: cornflowerblue solid 10px;
24-
gap-rule-overlap: row-over-column;
24+
rule-overlap: row-over-column;
2525
}
2626

2727
.subgrid {
@@ -36,7 +36,7 @@
3636
column-rule: green solid 10px;
3737
row-rule: blue solid 10px;
3838

39-
gap-rule-overlap: column-over-row;
39+
rule-overlap: column-over-row;
4040
}
4141

4242
.item {

css/css-gaps/multicol/multicol-gap-decorations-009.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
column-width: 60px;
3232
column-count: 3;
3333
column-fill: auto;
34-
gap-rule-overlap: column-over-row;
34+
rule-overlap: column-over-row;
3535
}
3636

3737
p {

css/css-gaps/multicol/multicol-gap-decorations-022.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
column-rule-interior-inset-end: 0px;
3131
column-rule-edge-inset-end: -5px;
3232
row-rule-edge-inset-end: 5px;
33-
gap-rule-overlap: column-over-row;
33+
rule-overlap: column-over-row;
3434
}
3535
p {
3636
background: rgb(96 139 168 / 0.2);

css/css-gaps/multicol/multicol-gap-decorations-023.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
column-rule-interior-inset-end: -8px;
3131
row-rule-edge-inset-start: -2px;
3232
row-rule-edge-inset-end: -1px;
33-
gap-rule-overlap: column-over-row;
33+
rule-overlap: column-over-row;
3434
}
3535
p {
3636
background: rgb(96 139 168 / 0.2);

css/css-gaps/parsing/rule-overlap-computed.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<title>CSS Gaps: gap-rule-overlap getComputedStyle()</title>
5+
<title>CSS Gaps: rule-overlap getComputedStyle()</title>
66
<link rel="author" title="Javier Contreras Tenorio" href="mailto:javiercon@microsoft.com">
7-
<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#paint-order">
7+
<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#overlap">
88
<script src="/resources/testharness.js"></script>
99
<script src="/resources/testharnessreport.js"></script>
1010
<script src="/css/support/computed-testcommon.js"></script>
@@ -13,8 +13,8 @@
1313
<body>
1414
<div id="target"></div>
1515
<script>
16-
test_computed_value("gap-rule-overlap", "row-over-column");
17-
test_computed_value("gap-rule-overlap", "column-over-row");
16+
test_computed_value("rule-overlap", "row-over-column");
17+
test_computed_value("rule-overlap", "column-over-row");
1818
</script>
1919
</body>
2020
</html>

css/css-gaps/parsing/rule-overlap-invalid.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<title>CSS Gaps: parsing gap-rule-overlap with invalid values</title>
5+
<title>CSS Gaps: parsing rule-overlap with invalid values</title>
66
<link rel="author" title="Javier Contreras Tenorio" href="mailto:javiercon@microsoft.com">
7-
<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#paint-order">
7+
<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#overlap">
88
<script src="/resources/testharness.js"></script>
99
<script src="/resources/testharnessreport.js"></script>
1010
<script src="/css/support/parsing-testcommon.js"></script>
1111
</head>
1212
<body>
1313
<div id="target"></div>
1414
<script>
15-
test_invalid_value('gap-rule-overlap', 'auto');
16-
test_invalid_value('gap-rule-overlap', 'true');
17-
test_invalid_value('gap-rule-overlap', 'none');
18-
test_invalid_value('gap-rule-overlap', '10px');
19-
test_invalid_value('gap-rule-overlap', '10%');
15+
test_invalid_value('rule-overlap', 'auto');
16+
test_invalid_value('rule-overlap', 'true');
17+
test_invalid_value('rule-overlap', 'none');
18+
test_invalid_value('rule-overlap', '10px');
19+
test_invalid_value('rule-overlap', '10%');
2020
</script>
2121
</body>
2222
</html>

0 commit comments

Comments
 (0)