diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
tree | 532507288f3defd7f4dcf1af49698bcb76034855 /testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html | |
parent | Adding debian version 126.0.1-1. (diff) | |
download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.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-002-ref.html')
-rw-r--r-- | testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html | 142 |
1 files changed, 75 insertions, 67 deletions
diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html index 4f6519db94..ddae8e7fe3 100644 --- a/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html +++ b/testing/web-platform/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html @@ -3,42 +3,39 @@ Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ --> -<html><head> +<html> <meta charset="utf-8"> <title>Reference: Masonry layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <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-auto-rows: 1em; border: 1px solid; padding: 0 1px 0 2px; vertical-align: top; width: min-content; } -.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 style="grid-template-columns: repeat(4, 2ch)"> <item style="width:2ch">1</item> <item>2</item> <item>3</item> @@ -46,7 +43,7 @@ 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> @@ -59,7 +56,7 @@ 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> @@ -67,26 +64,28 @@ 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> @@ -105,17 +104,20 @@ item { <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 --> -<grid class="fr"> +<section class="fr"> +<grid style="grid-template-columns: repeat(4, 2ch)"> <item style="width:2ch">1</item> <item>2</item> <item>3</item> @@ -123,7 +125,7 @@ item { <item>5</item> </grid> -<grid class="fr" style="grid-template-columns: 1ch 2fr 1fr 1fr"> +<grid style="grid-template-columns: repeat(4, 2ch)"> <item>1</item> <item>2</item> <item>3</item> @@ -131,42 +133,43 @@ 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> @@ -174,7 +177,7 @@ item { <item style="grid-column:span 4">5</item> </grid> -<grid class="fr"> +<grid> <item>1</item> <item>2</item> <item>3</item> @@ -182,18 +185,20 @@ item { <item style="width:6ch; grid-column:span 4">5</item> </grid> -<grid class="fr" style="grid-template-columns: 1ch 1ch 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 --> -<grid class="mixed" style="grid-template-columns: 2ch 1ch 1ch 1ch"> +<section class="mixed"> +<grid style="grid-template-columns: repeat(4, 2ch)"> <item style="width:2ch">1</item> <item>2</item> <item>3</item> @@ -201,7 +206,7 @@ item { <item>5</item> </grid> -<grid class="mixed" style="grid-template-columns: 1ch 1ch 1ch 1ch"> +<grid style="grid-template-columns: repeat(4, 2ch)"> <item>1</item> <item>2</item> <item>3</item> @@ -209,42 +214,44 @@ 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> @@ -252,7 +259,7 @@ item { <item style="grid-column:span 4">5</item> </grid> -<grid class="mixed"> +<grid> <item>1</item> <item>2</item> <item>3</item> @@ -260,13 +267,14 @@ item { <item style="width:6ch; grid-column:span 4">5</item> </grid> -<grid class="mixed" style="grid-template-columns: 1ch 1ch 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> + -</body> -</html> |