diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html')
-rw-r--r-- | testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html | 91 |
1 files changed, 44 insertions, 47 deletions
diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html index 0f6cdb1495..cc0608eafe 100644 --- a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html +++ b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html @@ -3,43 +3,40 @@ Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ --> -<html><head> +<html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout intrinsic sizing</title> + <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> - <link rel="help" href="https://drafts.csswg.org/css-grid-2"> + <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="masonry-intrinsic-sizing-001-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -html,body { - color:black; background-color:white; font:15px/1 Ahem; padding:0; margin:0; -} + +@import "support/masonry-intrinsic-sizing-visual.css"; grid { display: inline-grid; gap: 1px 2px; - grid-template-columns: repeat(4,auto); grid-template-rows: masonry; 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; } - -item { - background-color: #444; - color: blue; -} </style> -</head> + <body> -<grid> +<section class="auto"> +<grid title="Wider 1st item 2ch"> <item style="width:2ch">1</item> <item>2</item> <item>3</item> @@ -47,7 +44,7 @@ item { <item>5</item> </grid> -<grid> +<grid title="Wider 5th item 2ch"> <item>1</item> <item>2</item> <item>3</item> @@ -55,7 +52,7 @@ item { <item style="width:2ch">5</item> </grid> -<grid> +<grid title="Wider 5th item 2ch in col 2"> <item>1</item> <item>2</item> <item>3</item> @@ -63,7 +60,7 @@ item { <item style="width:2ch; grid-column:2">5</item> </grid> -<grid> +<grid title="Wider 5th item 4ch in col 2-3"> <item>1</item> <item>2</item> <item>3</item> @@ -71,7 +68,7 @@ item { <item style="width:4ch; grid-column:2/span 2">5</item> </grid> -<grid> +<grid title="5th item in col 2-3, wider 6th item 5ch in col 1-3"> <item>1</item> <item>2</item> <item>3</item> @@ -80,8 +77,7 @@ item { <item style="width:5ch; grid-column:1/span 3">6</item> </grid> - -<grid> +<grid title="5th item 3ch in 2-3, 6th item 5ch in 1-3"> <item>1</item> <item>2</item> <item>3</item> @@ -90,7 +86,7 @@ item { <item style="width:5ch; grid-column:1/span 3">6</item> </grid> -<grid> +<grid title="5th item span 4"> <item>1</item> <item>2</item> <item>3</item> @@ -98,7 +94,7 @@ item { <item style="grid-column:span 4">5</item> </grid> -<grid> +<grid title="5th item 6ch span 4"> <item>1</item> <item>2</item> <item>3</item> @@ -106,17 +102,19 @@ item { <item style="width:6ch; grid-column:span 4">5</item> </grid> -<grid> +<grid title="5th item 6ch span 3"> <item>1</item> <item>2</item> <item>3</item> <item>4</item> <item style="width:6ch; grid-column:span 3">5</item> </grid> +</section> <!-- ditto with 'fr' sizing --> -<grid class="fr"> +<section class="fr"> +<grid title="Wider 1st item 2ch"> <item style="width:2ch">1</item> <item>2</item> <item>3</item> @@ -124,7 +122,7 @@ item { <item>5</item> </grid> -<grid class="fr"> +<grid title="Wider 5th item 2ch"> <item>1</item> <item>2</item> <item>3</item> @@ -132,7 +130,7 @@ item { <item style="width:2ch">5</item> </grid> -<grid class="fr"> +<grid title="Wider 5th item 2ch in col 2"> <item>1</item> <item>2</item> <item>3</item> @@ -140,7 +138,7 @@ item { <item style="width:2ch; grid-column:2">5</item> </grid> -<grid class="fr"> +<grid title="Wider 5th item 4ch in col 2-3"> <item>1</item> <item>2</item> <item>3</item> @@ -148,7 +146,7 @@ item { <item style="width:4ch; grid-column:2/span 2">5</item> </grid> -<grid class="fr"> +<grid title="5th item in col 2-3, wider 6th item 5ch in col 1-3"> <item>1</item> <item>2</item> <item>3</item> @@ -157,8 +155,7 @@ item { <item style="width:5ch; grid-column:1/span 3">6</item> </grid> - -<grid class="fr"> +<grid title="5th item 3ch in 2-3, 6th item 5ch in 1-3"> <item>1</item> <item>2</item> <item>3</item> @@ -167,7 +164,7 @@ item { <item style="width:5ch; grid-column:1/span 3">6</item> </grid> -<grid class="fr"> +<grid title="5th item span 4"> <item>1</item> <item>2</item> <item>3</item> @@ -175,7 +172,7 @@ item { <item style="grid-column:span 4">5</item> </grid> -<grid class="fr"> +<grid title="5th item 6ch span 4"> <item>1</item> <item>2</item> <item>3</item> @@ -183,18 +180,19 @@ item { <item style="width:6ch; grid-column:span 4">5</item> </grid> -<grid class="fr"> +<grid title="5th item 6ch span 3"> <item>1</item> <item>2</item> <item>3</item> <item>4</item> <item style="width:6ch; grid-column:span 3">5</item> </grid> - +</section> <!-- ditto with mixed sizing --> -<grid class="mixed"> +<section class="mixed"> +<grid title="Wider 1st item 2ch"> <item style="width:2ch">1</item> <item>2</item> <item>3</item> @@ -202,7 +200,7 @@ item { <item>5</item> </grid> -<grid class="mixed"> +<grid title="Wider 5th item 2ch"> <item>1</item> <item>2</item> <item>3</item> @@ -210,7 +208,7 @@ item { <item style="width:2ch">5</item> </grid> -<grid class="mixed"> +<grid title="Wider 5th item 2ch in col 2"> <item>1</item> <item>2</item> <item>3</item> @@ -218,7 +216,7 @@ item { <item style="width:2ch; grid-column:2">5</item> </grid> -<grid class="mixed"> +<grid title="Wider 5th item 4ch in col 2-3"> <item>1</item> <item>2</item> <item>3</item> @@ -226,7 +224,7 @@ item { <item style="width:4ch; grid-column:2/span 2">5</item> </grid> -<grid class="mixed"> +<grid title="5th item in col 2-3, wider 6th item 5ch in col 1-3"> <item>1</item> <item>2</item> <item>3</item> @@ -236,7 +234,7 @@ item { </grid> -<grid class="mixed"> +<grid title="5th item 3ch in 2-3, 6th item 5ch in 1-3"> <item>1</item> <item>2</item> <item>3</item> @@ -245,7 +243,7 @@ item { <item style="width:5ch; grid-column:1/span 3">6</item> </grid> -<grid class="mixed"> +<grid title="5th item span 4"> <item>1</item> <item>2</item> <item>3</item> @@ -253,7 +251,7 @@ item { <item style="grid-column:span 4">5</item> </grid> -<grid class="mixed"> +<grid title="5th item 6ch span 4"> <item>1</item> <item>2</item> <item>3</item> @@ -261,13 +259,12 @@ item { <item style="width:6ch; grid-column:span 4">5</item> </grid> -<grid class="mixed"> +<grid title="5th item 6ch span 3"> <item>1</item> <item>2</item> <item>3</item> <item>4</item> <item style="width:6ch; grid-column:span 3">5</item> </grid> +</section> -</body> -</html> |