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/gap | |
| 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/gap')
4 files changed, 145 insertions, 12 deletions
diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html index 031629e926..7157460267 100644 --- a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html +++ b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html @@ -15,7 +15,7 @@ html,body { grid { display: inline-grid; gap: 10px 20px; - grid-template-columns: auto min-content repeat(2,auto); + grid-template-columns: auto min-content repeat(2,auto); color: #444; border: 1px solid; padding: 2px; @@ -27,6 +27,8 @@ item { padding: 20px; margin: 3px; border: 5px solid blue; + place-self: start; + grid-row: span 2; } </style> </head> @@ -34,9 +36,8 @@ item { <grid> <item>1</item> - <item style="padding:0; place-self:start; min-width:0">2</item> + <item style="padding:0; grid-row: span 1">2</item> <item>3</item> <item>4</item> - <item style="order:1; width:0; margin-right:-23px; margin-top:-37px; align-self:start">5</item> - <item>6</item> + <item style="padding:0; grid-column: 2; grid-row: 2">5</item> </grid> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html index 673bbe40e4..628c00135d 100644 --- a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html +++ b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html @@ -7,7 +7,7 @@ <meta charset="utf-8"> <title>CSS Grid Test: Masonry layout with definite `gap` in both axes</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/#alignment"> <link rel="match" href="masonry-gap-001-ref.html"> <style> html,body { @@ -17,7 +17,7 @@ html,body { grid { display: inline-grid; gap: 10px 20px; - grid-template-columns: repeat(4,auto); + grid-template-columns: repeat(4,auto); grid-template-rows: masonry; color: #444; border: 1px solid; @@ -36,10 +36,9 @@ item { <body> <grid> - <item>1</item> - <item style="padding:0">2</item> - <item>3</item> - <item>4</item> - <item>5</item> - <item>6</item> + <item style="grid-column: 1;">1</item> + <item style="padding:0; grid-column: 2;">2</item> + <item style="grid-column: 3;">3</item> + <item style="grid-column: 4;">4</item> + <item style="padding:0; grid-column: 2;">5</item> </grid> diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002-ref.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002-ref.html new file mode 100644 index 0000000000..834a884f76 --- /dev/null +++ b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002-ref.html @@ -0,0 +1,62 @@ +<!DOCTYPE HTML> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<html><head> + <meta charset="utf-8"> + <title>Reference: Masonry layout with normal `gap` in both axes</title> + <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> + <link rel="author" title="Elika J. Etemad" href="https://fantasai.inkedblade.net/contact"> + <style> +html,body { + color:black; background-color:white; font:25px/1 "Courier New", monospace; padding:0; margin:0; +} + +grid { + display: inline-grid; + gap: 0; + grid-template-columns: auto min-content repeat(2,auto); + color: #444; + border: 1px solid; + padding: 2px; +} + +item { + background-color: #444; + color: #fff; + padding: 20px; + margin: 3px; + border: 5px solid blue; + place-self: start; + grid-row: span 2; + display: block; +} +</style> +</head> +<body> + +<grid> + <item>1</item> + <item style="padding:0; grid-row: span 1">2</item> + <item>3</item> + <item>4</item> + <item style="padding:0; grid-column: 2; grid-row: 2">5</item> +</grid> + +<grid> + <item>1</item> + <item style="padding:0; grid-row: span 1">2</item> + <item>3</item> + <item>4</item> + <item style="padding:0; grid-column: 2; grid-row: 2">5</item> +</grid> + +<grid> + <div style="columns: 3; column-gap: 1em;"> + <item>1</item> + <item>2</item> + <item>3</item> + </div> +</grid> + diff --git a/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002.html b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002.html new file mode 100644 index 0000000000..6dae0a1a72 --- /dev/null +++ b/testing/web-platform/tests/css/css-grid/masonry/tentative/gap/masonry-gap-002.html @@ -0,0 +1,71 @@ +<!DOCTYPE HTML> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<html><head> + <meta charset="utf-8"> + <title>CSS Grid Test: Masonry layout with normal `gap` in both axes</title> + <meta name="assert" + content="Test passes if a 'normal' gap is the initial value, + is resolved to zero, + does not allow margin collapsing, + and inherits as 'normal' in masonry layout"> + <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> + <link rel="author" title="Elika J. Etemad" href="https://fantasai.inkedblade.net/contact"> + <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> + <link rel="match" href="masonry-gap-001-ref.html"> + <style> +html,body { + color:black; background-color:white; font:25px/1 "Courier New", monospace; padding:0; margin:0; +} + +grid { + display: inline-grid; + grid-template-columns: repeat(4,auto); + grid-template-rows: masonry; + color: #444; + border: 1px solid; + padding: 2px; +} + +item { + background-color: #444; + color: #fff; + padding: 20px; + margin: 3px; + border: 5px solid blue; + display: block; +} + +</style> +</head> +<body> + +<!-- test initial value of normal --> +<grid> + <item style="grid-column: 1;">1</item> + <item style="padding:0; grid-column: 2;">2</item> + <item style="grid-column: 3;">3</item> + <item style="grid-column: 4;">4</item> + <item style="padding:0; grid-column: 2;">5</item> +</grid> + +<!-- test that 'normal' is supported and also resolves to zero --> +<grid style="gap: 10px; gap: normal"> + <item style="grid-column: 1;">1</item> + <item style="padding:0; grid-column: 2;">2</item> + <item style="grid-column: 3;">3</item> + <item style="grid-column: 4;">4</item> + <item style="padding:0; grid-column: 2;">5</item> +</grid> + +<!-- test inheritance of normal as keyword --> + +<grid style="gap: 10px; gap: normal"> + <div style="columns: 3; gap: inherit;"> + <item>1</item> + <item>2</item> + <item>3</item> + </div> +</grid> |