Skip to content

[Masonry] Simplify subgrid wpt tests #58059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonathan-j-lee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Masonry] Simplify subgrid wpt tests #58059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001a-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,20 @@

<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: -->

<grid style="grid:grid-lanes/none">
<grid class="rows">
<grid-lanes-track>
<item class="nth-1">1</item>
<item class="purple js">2</item>
<item>5</item>
</grid-lanes-track>
<grid-lanes-track>
<item class="purple">2</item>
<item>3</item>
<subgrid style="grid:grid-lanes/none">
<item class="nth-1">4a</item>
<item style="margin-right:15px" class="purple js">4b</item>
<subgrid>
<item class="nth-1" style="grid-row:span 2; align-self:start">4a</item>
<item class="purple">4b</item>
<item style="grid-column:2">4c</item>
</subgrid>
</grid-lanes-track>
</grid>

</body></html>
29 changes: 11 additions & 18 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001a.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@
color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
}

grid {
grid-lanes {
display: inline grid-lanes;
grid-lanes-direction: row;
grid-template-rows: 50px 80px 40px;
grid-template-columns: 50px 80px 40px;
gap: 4px 2px;
padding: 1px 3px 5px 7px;
border: solid;
border-width: 3px 5px 1px 1px;
background: lightgrey content-box;
}
.rows {
grid-template-columns: 50px 80px 40px;
}
item {
background: grey;
width: 3ch;
Expand All @@ -41,27 +37,24 @@
subgrid {
display: grid;
grid: subgrid / subgrid;
grid-row: 2 / span 2;
grid-column: 2 / span 2;
grid-gap: 8px 20px;
background: yellow;
}
.rows > subgrid {
grid-row: initial;
grid-column: 2 / span 2;
flow-tolerance: 0px;
}
</style>
</head>
<body>


<grid>
<grid-lanes>
<item>1</item>
<item>2</item>
<item>3</item>
<subgrid>
<item>4a</item>
<item style="margin-right:15px">4b</item>
<item>4b</item>
<item>4c</item>
</subgrid>
</grid>

</body></html>
<item>5</item>
</grid-lanes>
</body>
</html>
8 changes: 4 additions & 4 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001b-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@

<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: -->

<grid>
<grid class="rows">
<grid-lanes-track>
<item class="nth-1">1</item>
<item>5</item>
</grid-lanes-track>
<grid-lanes-track>
<item class="purple">2</item>
<item>3</item>
<subgrid>
<item class="nth-1" style="grid-column:span 2">4a</item>
<item class="purple js">4b</item>
<subgrid style="grid:auto/subgrid">
<item class="nth-1">4a</item>
<item class="purple">4b</item>
<item>4c</item>
</subgrid>
</grid-lanes-track>
Expand Down
26 changes: 8 additions & 18 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001b.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@
color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
}

grid {
grid-lanes {
display: inline grid-lanes;
grid-lanes-direction: row;
grid-template-rows: 50px 80px 40px;
grid-template-columns: 50px 80px 40px;
gap: 4px 2px;
padding: 1px 3px 5px 7px;
border: solid;
border-width: 3px 5px 1px 1px;
background: lightgrey content-box;
}
.rows {
grid-template-columns: 50px 80px 40px;
}
item {
background: grey;
width: 3ch;
Expand All @@ -41,29 +37,23 @@
subgrid {
display: grid;
grid: subgrid / subgrid;
grid-row: 2 / span 2;
grid-column: 2 / span 2;
grid-gap: 8px 20px;
background: yellow;
}
.rows > subgrid {
grid-row: initial;
grid-column: 2 / span 2;
}
</style>
</head>
<body>


<grid>
<grid-lanes>
<item>1</item>
<item>2</item>
<item>3</item>
<subgrid>
<subgrid style="grid:auto/subgrid">
<item>4a</item>
<item>4b</item>
<item>4c</item>
</subgrid>
<item>5</item>
</grid>

</body></html>
</grid-lanes>
</body>
</html>
6 changes: 3 additions & 3 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001c-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@

<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: -->

<grid>
<grid class="rows">
<grid-lanes-track>
<item class="nth-1">1</item>
<item>5</item>
</grid-lanes-track>
<grid-lanes-track>
<item class="purple">2</item>
<item>3</item>
<subgrid style="grid:subgrid/auto">
<subgrid style="grid:auto/subgrid; grid-auto-flow:column">
<item class="nth-1">4a</item>
<item class="purple js">4b</item>
<item class="purple">4b</item>
<item>4c</item>
</subgrid>
</grid-lanes-track>
Expand Down
26 changes: 8 additions & 18 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001c.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@
color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
}

grid {
grid-lanes {
display: inline grid-lanes;
grid-lanes-direction: row;
grid-template-rows: 50px 80px 40px;
grid-template-columns: 50px 80px 40px;
gap: 4px 2px;
padding: 1px 3px 5px 7px;
border: solid;
border-width: 3px 5px 1px 1px;
background: lightgrey content-box;
}
.rows {
grid-template-columns: 50px 80px 40px;
}
item {
background: grey;
width: 3ch;
Expand All @@ -41,29 +37,23 @@
subgrid {
display: grid;
grid: subgrid / subgrid;
grid-row: 2 / span 2;
grid-column: 2 / span 2;
grid-gap: 8px 20px;
background: yellow;
}
.rows > subgrid {
grid-row: initial;
grid-column: 2 / span 2;
}
</style>
</head>
<body>


<grid>
<grid-lanes>
<item>1</item>
<item>2</item>
<item>3</item>
<subgrid style="grid:subgrid/auto">
<subgrid style="grid:auto/subgrid; grid-auto-flow:column">
<item>4a</item>
<item>4b</item>
<item>4c</item>
</subgrid>
<item>5</item>
</grid>

</body></html>
</grid-lanes>
</body>
</html>
6 changes: 3 additions & 3 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001d-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@

<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: -->

<grid>
<grid class="rows">
<grid-lanes-track>
<item class="nth-1">1</item>
<item>5</item>
</grid-lanes-track>
<grid-lanes-track>
<item class="purple">2</item>
<item>3</item>
<subgrid style="grid:subgrid/auto; grid-auto-flow:column">
<subgrid style="grid:auto auto/subgrid">
<item class="nth-1">4a</item>
<item class="purple js">4b</item>
<item class="purple">4b</item>
<item>4c</item>
</subgrid>
</grid-lanes-track>
Expand Down
26 changes: 8 additions & 18 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001d.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@
color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
}

grid {
grid-lanes {
display: inline grid-lanes;
grid-lanes-direction: row;
grid-template-rows: 50px 80px 40px;
grid-template-columns: 50px 80px 40px;
gap: 4px 2px;
padding: 1px 3px 5px 7px;
border: solid;
border-width: 3px 5px 1px 1px;
background: lightgrey content-box;
}
.rows {
grid-template-columns: 50px 80px 40px;
}
item {
background: grey;
width: 3ch;
Expand All @@ -41,29 +37,23 @@
subgrid {
display: grid;
grid: subgrid / subgrid;
grid-row: 2 / span 2;
grid-column: 2 / span 2;
grid-gap: 8px 20px;
background: yellow;
}
.rows > subgrid {
grid-row: initial;
grid-column: 2 / span 2;
}
</style>
</head>
<body>


<grid>
<grid-lanes>
<item>1</item>
<item>2</item>
<item>3</item>
<subgrid style="grid:subgrid/auto; grid-auto-flow:column">
<subgrid style="grid:auto auto/subgrid">
<item>4a</item>
<item>4b</item>
<item>4c</item>
</subgrid>
<item>5</item>
</grid>

</body></html>
</grid-lanes>
</body>
</html>
4 changes: 2 additions & 2 deletions css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002a-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@

<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... -->

<grid>
<grid class="rows">
<item>1</item>
<item>2</item>
<item>3</item>
<subgrid style="grid: none">
<subgrid>
<item>4a</item>
<item>4b</item>
<item>4c</item>
Expand Down
Loading