Skip to content

Commit

Permalink
Bug 1892665 [wpt PR 45812] - [css-grid-2][masonry] Update intrinsic-s…
Browse files Browse the repository at this point in the history 
…izing tests for spec update, a=testonly

Automatic update from web-platform-tests
[css-grid-2][masonry] Update intrinsic-sizing tests for spec update

See w3c/csswg-drafts#8206

--

wpt-commits: 035560344cabe6a4e2777a592e498a65663ba932
wpt-pr: 45812
  • Loading branch information
@fantasai @moz-wptsync-bot
fantasai authored and moz-wptsync-bot committed Apr 25, 2024
1 parent e685bf5 commit b8855c5
Show file tree
Hide file tree
Showing 12 changed files with 670 additions and 503 deletions.
126 changes: 68 additions & 58 deletions ...sts/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,34 @@
grid {
display: inline-grid;
gap: 1px 2px;
grid-template-columns: repeat(4,auto);
grid-auto-rows: 1em;
grid-auto-rows: auto;
border: 1px solid;
padding: 0 1px 0 2px;
vertical-align: top;
}
.fr {
.auto grid {
grid-template-columns: repeat(4,auto);
}
.fr grid {
grid-template-columns: 1fr 2fr 1fr 1fr;
}
.mixed {
.mixed grid {
grid-template-columns: 1fr 2fr min-content max-content;
}
</style>

<body>

<section>
<grid>
<section class="auto">
<grid style="grid-template-columns: repeat(4, 2ch)">
<item style="width:2ch">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</grid>

<grid style="grid-template-columns: 1ch repeat(3,auto)">
<grid style="grid-template-columns: repeat(4, 2ch)">
<item>1</item>
<item>2</item>
<item>3</item>
Expand All @@ -53,34 +55,36 @@
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:2ch; grid-column:2">5</item>
<item style="width:2ch; grid-area:1/2">5</item>
</grid>

<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:4ch; grid-column:2/span 2">5</item>
<item style="visibility: hidden">4</item>
<item style="width:4ch; grid-area:1/2/2/4">5</item>
</grid>

<grid>
<item>1</item>
<item style="grid-column: 4">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="grid-column:2/span 2">5</item>
<item style="width:5ch; grid-column:1/span 3">6</item>
<item style="visibility: hidden">4</item>
<item style="grid-area: 1/2/2/span 2">5</item>
<item style="width:5ch; grid-area: 2/1/3/4">6</item>
</grid>


<grid>
<item>1</item>
<item style="grid-column: 4">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:3ch; grid-column:2/span 2">5</item>
<item style="width:5ch; grid-column:1/span 3">6</item>
<item style="visibility: hidden">4</item>
<item style="width:3ch; grid-area:1/2/2/4">5</item>
<item style="width:5ch; grid-area:2/1/3/4">6</item>
</grid>

<grid>
Expand All @@ -99,170 +103,176 @@
<item style="width:6ch; grid-column:span 4">5</item>
</grid>

<grid style="grid-template-columns: repeat(4,1ch)">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:6ch; grid-column:span 3">5</item>
<item style="width:6ch; grid-area: 2/1/3/4">5</item>
<item style="width:6ch; grid-area: 2/2/3/5; visibility: hidden">5</item>
</grid>
</section>

<!-- ditto with 'fr' sizing -->

<section>
<grid class="fr">
<section class="fr">
<grid>
<item style="width:2ch">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</grid>

<grid class="fr" style="grid-template-columns: 1ch 2fr 1fr 1fr">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:2ch">5</item>
</grid>

<grid class="fr">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:2ch; grid-column:2">5</item>
<item style="width:2ch; grid-area: 1/2">5</item>
</grid>

<grid class="fr">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:4ch; grid-column:2/span 2">5</item>
<item style="width:4ch; grid-area: 1/2/2/4">5</item>
</grid>

<grid class="fr">
<item>1</item>
<grid>
<item style="grid-column: 4">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="grid-column:2/span 2">5</item>
<item style="width:5ch; grid-column:1/span 3">6</item>
<item style="visibility: hidden">4</item>
<item style="grid-area: 1/2/2/span 2">5</item>
<item style="width:5ch; grid-area: 2/1/3/4">6</item>
</grid>


<grid class="fr">
<item>1</item>
<grid>
<item style="grid-column: 4">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:3ch; grid-column:2/span 2">5</item>
<item style="width:5ch; grid-column:1/span 3">6</item>
<item style="visibility: hidden">4</item>
<item style="width:3ch; grid-area:1/2/2/4">5</item>
<item style="width:5ch; grid-area:2/1/3/4">6</item>
</grid>

<grid class="fr">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="grid-column:span 4">5</item>
</grid>

<grid class="fr">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:6ch; grid-column:span 4">5</item>
</grid>

<grid class="fr" style="grid-template-columns: 1ch 2ch 1ch 1ch">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:6ch; grid-column:span 3">5</item>
<item style="width:6ch; grid-area: 2/1/3/4">5</item>
<item style="width:6ch; grid-area: 2/2/3/5; visibility: hidden">5</item>
</grid>
</section>

<!-- ditto with mixed sizing -->

<section>
<grid class="mixed" style="grid-template-columns: 2ch 4ch 1ch 1ch">
<section class="mixed">
<grid style="grid-template-columns: 2ch 4ch 2ch 2ch">
<item style="width:2ch">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</grid>

<grid class="mixed" style="grid-template-columns: 1ch 2ch 1ch 1ch">
<grid style="grid-template-columns: 2ch 4ch 2ch 2ch">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:2ch">5</item>
</grid>

<grid class="mixed">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:2ch; grid-column:2">5</item>
<item style="width:2ch; grid-area: 1/2">5</item>
</grid>

<grid class="mixed">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:4ch; grid-column:2/span 2">5</item>
<item style="visibility: hidden">4</item>
<item style="width:4ch; grid-area: 1/2/2/4">5</item>
</grid>

<grid class="mixed">
<item>1</item>
<grid>
<item style="grid-column: 4">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="grid-column:2/span 2">5</item>
<item style="width:5ch; grid-column:1/span 3">6</item>
<item style="visibility: hidden">4</item>
<item style="grid-area: 1/2/2/span 2">5</item>
<item style="width:5ch; grid-area: 2/1/3/4">6</item>
</grid>


<grid class="mixed">
<item>1</item>
<grid>
<item style="grid-column: 4">1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:3ch; grid-column:2/span 2">5</item>
<item style="width:5ch; grid-column:1/span 3">6</item>
<item style="visibility: hidden">4</item>
<item style="width:3ch; grid-area:1/2/2/4">5</item>
<item style="width:5ch; grid-area:2/1/3/4">6</item>
</grid>

<grid class="mixed">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="grid-column:span 4">5</item>
</grid>

<grid class="mixed">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:6ch; grid-column:span 4">5</item>
</grid>

<grid class="mixed" style="grid-template-columns: 1ch 2ch 1ch 1ch">
<grid>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item style="width:6ch; grid-column:span 3">5</item>
<item style="width:6ch; grid-area: 2/1/3/4">5</item>
<item style="width:6ch; grid-area: 2/2/3/5; visibility: hidden">5</item>
</grid>
</section>

0 comments on commit b8855c5

Please sign in to comment.