commit 03b5d305b06dfa47b21f450a4e38f181fa6895da parent a885f827c2020b6da938972e8f957c7adcf655a8 Author: Alison Maher <almaher@microsoft.com> Date: Wed, 3 Dec 2025 14:41:47 +0000 Bug 2003326 [wpt PR 56374] - [Masonry] Update remaining refs to masonry in wpt tests, a=testonly Automatic update from web-platform-tests [Masonry] Update remaining refs to masonry in wpt tests Update any remaining references to "masonry" in wpt tests to use the new grid-lanes naming. This change also removed lingering references to masonry.css which no longer exists This CL should have no functional effect. Bug: 343257585 Change-Id: Ieaf84a7b6080465f25a0f62c54697cd59c17b3e9 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7208364 Commit-Queue: Alison Maher <almaher@microsoft.com> Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com> Cr-Commit-Position: refs/heads/main@{#1552243} -- wpt-commits: cd32869371ee72c21a152c36f6603fe97fd93648 wpt-pr: 56374 Diffstat:
408 files changed, 925 insertions(+), 971 deletions(-)
diff --git a/testing/web-platform/tests/css/css-display/parsing/tentative/display-computed.html b/testing/web-platform/tests/css/css-display/parsing/tentative/display-computed.html @@ -26,7 +26,7 @@ function test_display_affected(property, value) { test(() => { target.style[property] = value; target.style.display = 'inline-grid-lanes'; - assert_equals(getComputedStyle(target).display, 'grid-lanes', 'inline-masonry -> masonry'); + assert_equals(getComputedStyle(target).display, 'grid-lanes', 'inline-grid-lanes -> grid-lanes'); target.style[property] = ''; target.style.display = ''; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-alignment.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-alignment.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout alignment properties for absolutely positioned elements</title> + <title>CSS Grid Lanes Test: Grid Lanes layout alignment properties for absolutely positioned elements</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="column-grid-lanes-alignment-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-intrinsic-sizing-oof.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-intrinsic-sizing-oof.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout intrinsic size with only OOF children</title> + <title>CSS Grid Lanes Test: Grid Lanes layout intrinsic size with only OOF children</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-out-of-flow-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-out-of-flow-001.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout out-of-flow positioning</title> + <title>CSS Grid Lanes Test: Grid Lanes layout out-of-flow positioning</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="column-grid-lanes-out-of-flow-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-out-of-flow-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-out-of-flow-002.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout out-of-flow positioning</title> + <title>CSS Grid Lanes Test: Grid Lanes layout out-of-flow positioning</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="column-grid-lanes-out-of-flow-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-out-of-flow-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-out-of-flow-003.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout out-of-flow positioning</title> + <title>CSS Grid Lanes Test: Grid Lanes layout out-of-flow positioning</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="column-grid-lanes-out-of-flow-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-positioned-item-dynamic-change.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/column-grid-lanes-positioned-item-dynamic-change.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Layout Test: Masonry positioned item dynamic change.</title> + <title>CSS Grid Lanes Layout Test: Grid Lanes positioned item dynamic change.</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="column-grid-lanes-positioned-item-dynamic-change-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-alignment.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-alignment.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout alignment properties for absolutely positioned elements</title> + <title>CSS Grid Lanes Test: Grid Lanes layout alignment properties for absolutely positioned elements</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="row-grid-lanes-alignment-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-intrinsic-sizing-oof.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-intrinsic-sizing-oof.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout intrinsic size with only OOF children</title> + <title>CSS Grid Lanes Test: Grid Lanes layout intrinsic size with only OOF children</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-out-of-flow-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-out-of-flow-001.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout out-of-flow positioning</title> + <title>CSS Grid Lanes Test: Grid Lanes layout out-of-flow positioning</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="row-grid-lanes-out-of-flow-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-out-of-flow-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-out-of-flow-002.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout out-of-flow positioning</title> + <title>CSS Grid Lanes Test: Grid Lanes layout out-of-flow positioning</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="row-grid-lanes-out-of-flow-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-out-of-flow-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-out-of-flow-003.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout out-of-flow positioning</title> + <title>CSS Grid Lanes Test: Grid Lanes layout out-of-flow positioning</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="row-grid-lanes-out-of-flow-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-positioned-item-dynamic-change.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/abspos/row-grid-lanes-positioned-item-dynamic-change.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Layout Test: Masonry positioned item dynamic change.</title> + <title>CSS Grid Lanes Layout Test: Grid Lanes positioned item dynamic change.</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="match" href="../../../../reference/ref-filled-green-100px-square-only.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-001.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Self-Alignment along column axis of absolute positioned items</title> + <title>CSS Grid Lanes Test: Self-Alignment along column axis of absolute positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-002.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Safe and unsafe alignment values for positioned items</title> + <title>CSS Grid Lanes Test: Safe and unsafe alignment values for positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-003.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Mixed alignment values for positioned items</title> + <title>CSS Grid Lanes Test: Mixed alignment values for positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-alignment-positioned-items-004.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Combined align-self and justify-self for positioned items</title> + <title>CSS Grid Lanes Test: Combined align-self and justify-self for positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-justify-self-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-justify-self-001.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout with `justify-self`</title> + <title>CSS Grid Lanes Test: Grid Lanes layout with `justify-self`</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="column-grid-lanes-justify-self-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-justify-self-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-justify-self-002.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout with `justify-self` advanced values and safe/unsafe alignment</title> + <title>CSS Grid Lanes Test: Grid Lanes layout with `justify-self` advanced values and safe/unsafe alignment</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="column-grid-lanes-justify-self-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-justify-self-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-grid-lanes-justify-self-003.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout with `justify-self`</title> + <title>CSS Grid Lanes Test: Grid Lanes layout with `justify-self`</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="column-grid-lanes-justify-self-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-justify-items-center-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-justify-items-center-001.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <meta charset="utf-8"> -<title>CSS Masonry Test: Centered alignment in grid axis</title> +<title>CSS Grid Lanes Test: Centered alignment in grid axis</title> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="column-justify-items-center-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-justify-items-end-justify-self-start-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-justify-items-end-justify-self-start-001-ref.html @@ -23,7 +23,7 @@ } </style> <body> - <p>Test that using justify-items moves each masonry item to the end of the grid-axis track it is on</p> + <p>Test that using justify-items moves each grid-lanes item to the end of the grid-axis track it is on</p> <p>and that justify-self overrides justify-items.</p> <div class="grid"> <div class="flex"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-justify-items-end-justify-self-start-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/column-justify-items-end-justify-self-start-001.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <html> -<title>CSS Masonry Test: Alignment for items and self in grid axis</title> +<title>CSS Grid Lanes Test: Alignment for items and self in grid axis</title> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="column-justify-items-end-justify-self-start-001-ref.html"> @@ -21,7 +21,7 @@ } </style> <body> - <p>Test that using justify-items moves each masonry item to the end of the grid-axis track it is on</p> + <p>Test that using justify-items moves each grid-lanes item to the end of the grid-axis track it is on</p> <p>and that justify-self overrides justify-items.</p> <div class="grid-lanes"> <div class="fifty-width"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `align-content` in masonry axis</title> + <title>Reference: Grid Lanes layout with `align-content` in grid-lanes axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-001.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `align-content` in masonry axis (horizontal writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `align-content` in grid-lanes axis (horizontal writing mode)</title> <meta name="assert" content="Test passes if align-content shifts content - in the masonry axis of a masonry grid container + in the grid-lanes axis of a grid-lanes grid container and the grid container's baseline is also shifted accordingly."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-002-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `align-content` in masonry axis</title> + <title>Reference: Grid Lanes layout with `align-content` in grid-lanes axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-002.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `align-content` in masonry axis (vertical writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `align-content` in grid-lanes axis (vertical writing mode)</title> <meta name="assert" content="Test passes if align-content shifts content - in the masonry axis of a vertical writing-mode masonry grid container."> + in the grid-lanes axis of a vertical writing-mode grid-lanes grid container."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-003-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `align-content` in grid axis</title> + <title>Reference: Grid Lanes layout with `align-content` in grid axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-003.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `align-content` in grid axis (horizontal writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `align-content` in grid axis (horizontal writing mode)</title> <meta name="assert" content="Test passes if align-content distributes tracks - in the grid axis of a masonry grid container + in the grid axis of a grid-lanes grid container and the grid container's baseline is also shifted accordingly."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-004-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `align-content` in grid axis</title> + <title>Reference: Grid Lanes layout with `align-content` in grid axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-align-content-004.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `align-content` in grid axis (vertical writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `align-content` in grid axis (vertical writing mode)</title> <meta name="assert" content="Test passes if align-content distributes tracks - in the grid axis of a vertical writing-mode masonry grid container."> + in the grid axis of a vertical writing-mode grid-lanes grid container."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `justify-content` in grid axis</title> + <title>Reference: Grid Lanes layout with `justify-content` in grid axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-001.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `justify-content` in grid axis (horizontal writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `justify-content` in grid axis (horizontal writing mode)</title> <meta name="assert" content="Test passes if justify-content distributes tracks - in the grid axis of a masonry grid container."> + in the grid axis of a grid-lanes grid container."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-002-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `justify-content` in grid axis</title> + <title>Reference: Grid Lanes layout with `justify-content` in grid axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-002.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `justify-content` in grid axis (vertical writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `justify-content` in grid axis (vertical writing mode)</title> <meta name="assert" content="Test passes if justify-content distributes tracks - in the grid axis of a vertical writing-mode masonry grid container."> + in the grid axis of a vertical writing-mode grid-lanes grid container."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-003-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `justify-content` in masonry axis</title> + <title>Reference: Grid Lanes layout with `justify-content` in grid-lanes axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-003.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `justify-content` in masonry axis (horizontal writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `justify-content` in grid-lanes axis (horizontal writing mode)</title> <meta name="assert" content="Test passes if justify-content shifts content - in the masonry axis of a masonry grid container."> + in the grid-lanes axis of a grid-lanes grid container."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-004-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with `justify-content` in masonry axis</title> + <title>Reference: Grid Lanes layout with `justify-content` in grid-lanes axis</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/grid-lanes-justify-content-004.html @@ -5,10 +5,10 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with `justify-content` in masonry axis (vertical writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout with `justify-content` in grid-lanes axis (vertical writing mode)</title> <meta name="assert" content="Test passes if justify-content shifts content - in the masonry axis of a vertical writing-mode masonry grid container."> + in the grid-lanes axis of a vertical writing-mode grid-lanes grid container."> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="author" title="Kurt Catti-Schmidt" href="mailto:kschmi@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-align-items-center-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-align-items-center-001.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <meta charset="utf-8"> -<title>CSS Masonry Test: Centered alignment in grid axis</title> +<title>CSS Grid Lanes Test: Centered alignment in grid axis</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="row-align-items-center-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-align-items-end-align-self-start-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-align-items-end-align-self-start-001-ref.html @@ -11,7 +11,7 @@ } </style> <body> - <p>Test that using align-items moves each masonry item to the end of the grid-axis track it is on</p> + <p>Test that using align-items moves each grid-lanes item to the end of the grid-axis track it is on</p> <p>and that align-self overrides align-items.</p> <div class="grid"> <div style="width: 50px; height: 50px; background-color: lightblue;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-align-items-end-align-self-start-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-align-items-end-align-self-start-001.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <html> -<title>CSS Masonry Test: Alignment for items and self in grid axis</title> +<title>CSS Grid Lanes Test: Alignment for items and self in grid axis</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="row-align-items-end-align-self-start-001-ref.html"> @@ -21,7 +21,7 @@ } </style> <body> - <p>Test that using align-items moves each masonry item to the end of the grid-axis track it is on</p> + <p>Test that using align-items moves each grid-lanes item to the end of the grid-axis track it is on</p> <p>and that align-self overrides align-items.</p> <div class="grid-lanes"> <div style="width: 50px; height: 50px; background-color: lightblue;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-align-self-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-align-self-001.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout with `align-self`</title> + <title>CSS Grid Lanes Test: Grid Lanes layout with `align-self`</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="row-grid-lanes-align-self-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-align-self-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-align-self-002.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout with `align-self` advanced values and safe/unsafe alignment</title> + <title>CSS Grid Lanes Test: Grid Lanes layout with `align-self` advanced values and safe/unsafe alignment</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="row-grid-lanes-align-self-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-align-self-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-align-self-003.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Masonry layout with `align-self`</title> + <title>CSS Grid Lanes Test: Grid Lanes layout with `align-self`</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> <link rel="match" href="row-grid-lanes-align-self-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-001.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Self-Alignment along row axis of absolute positioned items</title> + <title>CSS Grid Lanes Test: Self-Alignment along row axis of absolute positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-002.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Safe and unsafe alignment values for positioned items</title> + <title>CSS Grid Lanes Test: Safe and unsafe alignment values for positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-003.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Mixed alignment values for positioned items</title> + <title>CSS Grid Lanes Test: Mixed alignment values for positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/alignment/row-grid-lanes-alignment-positioned-items-004.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: Combined justify-self and align-self for positioned items</title> + <title>CSS Grid Lanes Test: Combined justify-self and align-self for positioned items</title> <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#alignment"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-001-ref.html @@ -3,6 +3,6 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <body> - <p>Test that an empty masonry container renders nothing.</p> + <p>Test that an empty grid-lanes container renders nothing.</p> </body> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-001.html @@ -9,7 +9,7 @@ } </style> <body> - <p>Test that an empty masonry container renders nothing.</p> + <p>Test that an empty grid-lanes container renders nothing.</p> <div class="empty-container"></div> </body> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-002-ref.html @@ -10,7 +10,7 @@ }; </style> <body> - <p>Test that an empty masonry container still renders padding.</p> + <p>Test that an empty grid-lanes container still renders padding.</p> <div class="empty-container"> </div> </body> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/column-empty-grid-lanes-container-002.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Test that an empty masonry container still renders padding.</p> + <p>Test that an empty grid-lanes container still renders padding.</p> <div class="grid-lanes"></div> </body> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout fragmentation</title> + <title>Reference: Grid Lanes layout fragmentation</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -48,277 +48,277 @@ z { background: pink; height: 12px; } -masonry-track { +grid-lanes-track { float: left; height: 100%; gap: 2px; } -x,y,z,masonry-track { display: block; } -masonry-track > * { margin-bottom:2px; } -.last > masonry-track > :last-child { margin-bottom:0; } -masonry-track:nth-child(1) { width: 10px; } -masonry-track:nth-child(2) { width: 15px; margin-left:2px; } -masonry-track:nth-child(3) { width: 20px; margin-left:2px; } +x,y,z,grid-lanes-track { display: block; } +grid-lanes-track > * { margin-bottom:2px; } +.last > grid-lanes-track > :last-child { margin-bottom:0; } +grid-lanes-track:nth-child(1) { width: 10px; } +grid-lanes-track:nth-child(2) { width: 15px; margin-left:2px; } +grid-lanes-track:nth-child(3) { width: 20px; margin-left:2px; } </style></head> <body> <wrapper> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y><y></y><y></y><x></x><x></x><x></x><x></x></masonry-track> - <masonry-track><x></x><z></z><x></x><x></x><x></x><z></z><z></z></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z><x></x><y></y><x></x><x></x><y style="height:9px"></y></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><y></y><x></x><x></x><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x><x></x><x></x><z></z><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z><x></x><y></y><x></x><x></x><y style="height:9px"></y></grid-lanes-track> </div> <div class="grid last" style="height:1px"> - <masonry-track></masonry-track> - <masonry-track></masonry-track> - <masonry-track><y style="height:1px"></y></masonry-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track><y style="height:1px"></y></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y><y></y><y></y><x></x><x></x><x></x></masonry-track> - <masonry-track><x></x><z></z><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z><x></x><y></y><x></x><x></x></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><y></y><x></x><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z><x></x><y></y><x></x><x></x></grid-lanes-track> </div> <div class="grid last" style="height:12px"> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><y></y></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><y></y></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y><y></y><y></y><x></x><x></x></masonry-track> - <masonry-track><x></x><z></z><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z><x></x><y></y></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><y></y><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z><x></x><y></y></grid-lanes-track> </div> <div class="grid last" style="height:24px"> - <masonry-track><x></x><x></x><y></y></masonry-track> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> + <grid-lanes-track><x></x><x></x><y></y></grid-lanes-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y><y></y><y></y></masonry-track> - <masonry-track><x></x><z></z><x></x><x></x><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z><x></x><y style="height:5px;"></y></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><y></y></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z><x></x><y style="height:5px;"></y></grid-lanes-track> </div> <div class="grid last" style="height:31px"> - <masonry-track><z></z><z></z></masonry-track> - <masonry-track><x></x><x></x><x></x><x></x></masonry-track> - <masonry-track><y style="height:5px"></y><x></x><x></x><y></y></masonry-track> + <grid-lanes-track><z></z><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><x></x></grid-lanes-track> + <grid-lanes-track><y style="height:5px"></y><x></x><x></x><y></y></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y><y></y><y style="height:6px;"></y></masonry-track> - <masonry-track><x></x><z></z><x></x><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><y style="height:6px;"></y></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:4px;"></y><z></z><z></z></masonry-track> - <masonry-track><x></x><y></y><x></x><x></x><y style="height:5px;"></y></masonry-track> - <masonry-track><x></x><x></x><x></x><x></x><x></x></masonry-track> + <grid-lanes-track><y style="height:4px;"></y><z></z><z></z></grid-lanes-track> + <grid-lanes-track><x></x><y></y><x></x><x></x><y style="height:5px;"></y></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><x></x><x></x></grid-lanes-track> </div> <div class="grid last" style="height:5px"> - <masonry-track></masonry-track> - <masonry-track><y style="height:5px;"></y></masonry-track> - <masonry-track></masonry-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track><y style="height:5px;"></y></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y><y style="height:8px;"></y></masonry-track> - <masonry-track><x></x><z></z><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x></masonry-track> + <grid-lanes-track><x></x><y></y><y style="height:8px;"></y></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:2px;"></y><y></y><y></y></masonry-track> - <masonry-track><z></z><x></x><x></x></masonry-track> - <masonry-track><x></x><x></x><z></z></masonry-track> + <grid-lanes-track><y style="height:2px;"></y><y></y><y></y></grid-lanes-track> + <grid-lanes-track><z></z><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><z></z></grid-lanes-track> </div> <div class="grid last" style="height:24px"> - <masonry-track><x></x><x></x><x></x></masonry-track> - <masonry-track><x></x><x></x><y></y></masonry-track> - <masonry-track><z></z></masonry-track> + <grid-lanes-track><x></x><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><y></y></grid-lanes-track> + <grid-lanes-track><z></z></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y></y></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x><x></x></masonry-track> + <grid-lanes-track><x></x><y></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><x></x><y style="height:4px;"></y></masonry-track> - <masonry-track><y></y></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x><y style="height:4px;"></y></grid-lanes-track> + <grid-lanes-track><y></y></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z></z></masonry-track> - <masonry-track><y style="height:6px;"></y><x></x></masonry-track> - <masonry-track><x></x><x></x><y style="height:4px;"></y></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><y style="height:6px;"></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><y style="height:4px;"></y></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> - <masonry-track><y style="height:6px;"></y><x></x></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> + <grid-lanes-track><y style="height:6px;"></y><x></x></grid-lanes-track> </div> <div class="grid last"> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> - <masonry-track><x></x><y></y></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><y></y></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y style="height:4px;"></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><x></x><y style="height:4px;"></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:6px;"></y><y style="height:4px;"></y></masonry-track> - <masonry-track><z style="height:12px;"></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> + <grid-lanes-track><y style="height:6px;"></y><y style="height:4px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:12px;"></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:6px;"></y><y style="height:4px;"></y></masonry-track> - <masonry-track><x></x><x></x></masonry-track> - <masonry-track><z style="height:12px;"></z></masonry-track> + <grid-lanes-track><y style="height:6px;"></y><y style="height:4px;"></y></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> + <grid-lanes-track><z style="height:12px;"></z></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:6px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x><y style="height:5px;"></y></masonry-track> + <grid-lanes-track><y style="height:6px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x><y style="height:5px;"></y></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:12px;"></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> - <masonry-track><y style="height:5px;"></y><x></x></masonry-track> + <grid-lanes-track><z style="height:12px;"></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> + <grid-lanes-track><y style="height:5px;"></y><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:12px;"></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> - <masonry-track><x></x><y style="height:5px;"></y></masonry-track> + <grid-lanes-track><z style="height:12px;"></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><y style="height:5px;"></y></grid-lanes-track> </div> <div class="grid last" style="height:5px;"> - <masonry-track></masonry-track> - <masonry-track></masonry-track> - <masonry-track><y style="height:5px;"></y></masonry-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track><y style="height:5px;"></y></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y style="height:3px;"></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><x></x><y style="height:3px;"></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:7px;"></y><y style="height:3px;"></y></masonry-track> - <masonry-track><z style="height:11px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:7px;"></y><y style="height:3px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:11px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:8px;"></y></masonry-track> - <masonry-track><z style="height:1px;"></z><x></x><y style="height:1px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:8px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:1px;"></z><x></x><y style="height:1px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:11px;"></z></masonry-track> - <masonry-track><y style="height:9px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><z style="height:11px;"></z></grid-lanes-track> + <grid-lanes-track><y style="height:9px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:1px;"></z></masonry-track> - <masonry-track><x></x><y style="height:4px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><z style="height:1px;"></z></grid-lanes-track> + <grid-lanes-track><x></x><y style="height:4px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:11px;"></z></masonry-track> - <masonry-track><y style="height:6px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><z style="height:11px;"></z></grid-lanes-track> + <grid-lanes-track><y style="height:6px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:1px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><z style="height:1px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:11px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x><y style="height:4px;"></y></masonry-track> + <grid-lanes-track><z style="height:11px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x><y style="height:4px;"></y></grid-lanes-track> </div> <div class="grid last" style="height:6px;"> - <masonry-track><z style="height:1px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><y style="height:6px;"></y></masonry-track> + <grid-lanes-track><z style="height:1px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><y style="height:6px;"></y></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:8px;"></y></masonry-track> - <masonry-track><z style="height:8px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:8px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:8px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:2px;"></y><y style="height:4px;"></y></masonry-track> - <masonry-track><z style="height:4px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:2px;"></y><y style="height:4px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:4px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:6px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><z style="height:8px;"></z></masonry-track> + <grid-lanes-track><y style="height:6px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><z style="height:8px;"></z></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><x></x></masonry-track> - <masonry-track><y style="height:8px;"></y></masonry-track> - <masonry-track><z style="height:4px;"></z></masonry-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><y style="height:8px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:4px;"></z></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><x></x><y style="height:1px;"></y></masonry-track> - <masonry-track><y style="height:2px;"></y></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><x></x><y style="height:1px;"></y></grid-lanes-track> + <grid-lanes-track><y style="height:2px;"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:8px;"></y></masonry-track> - <masonry-track><z style="height:8px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:8px;"></y></grid-lanes-track> + <grid-lanes-track><z style="height:8px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:1px;"></y><x></x></masonry-track> - <masonry-track><z style="height:4px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:1px;"></y><x></x></grid-lanes-track> + <grid-lanes-track><z style="height:4px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:8px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x><y style="height:1px;"></y></masonry-track> + <grid-lanes-track><z style="height:8px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x><y style="height:1px;"></y></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z style="height:4px;"></z></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><y style="height:8px;"></y></masonry-track> + <grid-lanes-track><z style="height:4px;"></z></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><y style="height:8px;"></y></grid-lanes-track> </div> <div class="grid last" style="height:1px;"> - <masonry-track></masonry-track> - <masonry-track></masonry-track> - <masonry-track><y style="height:1px;"></y></masonry-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track><y style="height:1px;"></y></grid-lanes-track> </div> </div> <script> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-001.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout fragmentation</title> + <title>CSS Grid Test: Grid Lanes layout fragmentation</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-fragmentation-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-002-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout fragmentation</title> + <title>Reference: Grid Lanes layout fragmentation</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -51,73 +51,73 @@ z { background: pink; height: 12px; } -masonry-track { +grid-lanes-track { float: left; height: 100%; gap: 2px; } -x,y,s,z,masonry-track { display: block; } -masonry-track > * { margin-bottom:2px; } -masonry-track.last > :last-child { margin-bottom:0; } -masonry-track:nth-child(1) { width: 10px; } -masonry-track:nth-child(2) { width: 15px; margin-left:2px; } -masonry-track:nth-child(3) { width: 20px; margin-left:2px; } +x,y,s,z,grid-lanes-track { display: block; } +grid-lanes-track > * { margin-bottom:2px; } +grid-lanes-track.last > :last-child { margin-bottom:0; } +grid-lanes-track:nth-child(1) { width: 10px; } +grid-lanes-track:nth-child(2) { width: 15px; margin-left:2px; } +grid-lanes-track:nth-child(3) { width: 20px; margin-left:2px; } </style></head> <body> <wrapper> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y class="c1"></y><x></x><y class="c1"></y><x></x></masonry-track> - <masonry-track><x></x><s></s><x></x><s style="margin-bottom:6px"></s><y class="c2" style="height:5px"></y></masonry-track> - <masonry-track><x></x><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y class="c1"></y><x></x><y class="c1"></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><s></s><x></x><s style="margin-bottom:6px"></s><y class="c2" style="height:5px"></y></grid-lanes-track> + <grid-lanes-track><x></x><z></z><x></x><z></z></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><x></x><x></x><s style="height:5px"></s><y class="c1"></y><z class="c1"></z><y class="c1" style="height:1px"></y></masonry-track> - <masonry-track><y class="c2" style="height:5px"></y><z></z></masonry-track> - <masonry-track><s style="height:5px"></s><x></x><x></x><x></x><x></x><x></x><x></x></masonry-track> + <grid-lanes-track><x></x><x></x><s style="height:5px"></s><y class="c1"></y><z class="c1"></z><y class="c1" style="height:1px"></y></grid-lanes-track> + <grid-lanes-track><y class="c2" style="height:5px"></y><z></z></grid-lanes-track> + <grid-lanes-track><s style="height:5px"></s><x></x><x></x><x></x><x></x><x></x><x></x></grid-lanes-track> </div> <div class="grid last" style="height:9px"> - <masonry-track><y style="height:9px" class="c1"></y></masonry-track> - <masonry-track></masonry-track> - <masonry-track></masonry-track> + <grid-lanes-track><y style="height:9px" class="c1"></y></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> </div> </div> <div class="columns"> <div class="grid first"> - <masonry-track><x></x><y class="c1"></masonry-track> - <masonry-track><x></x></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><x></x><y class="c1"></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><y class="c2"></y></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><y class="c2"></y></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><x></x><s style="height:5px"></s><y style="height:4px" class="c1"></y></masonry-track> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> + <grid-lanes-track><x></x><s style="height:5px"></s><y style="height:4px" class="c1"></y></grid-lanes-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><y style="height:6px" class="c1"></y><y class="c1"></y></masonry-track> - <masonry-track></masonry-track> - <masonry-track><x></x></masonry-track> + <grid-lanes-track><y style="height:6px" class="c1"></y><y class="c1"></y></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z></z></masonry-track> - <masonry-track><x></x><x></x></masonry-track> - <masonry-track><x></x><x></x></masonry-track> + <grid-lanes-track><z></z></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> </div> <div class="grid middle"> - <masonry-track><z class="c1"></z><y style="height:4px" class="c1"></y></masonry-track> - <masonry-track></masonry-track> - <masonry-track><x></x><x></x></masonry-track> + <grid-lanes-track><z class="c1"></z><y style="height:4px" class="c1"></y></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track><x></x><x></x></grid-lanes-track> </div> <div class="grid last" style="height:6px;"> - <masonry-track><y style="height:6px" class="c1"></y></masonry-track> - <masonry-track></masonry-track> - <masonry-track></masonry-track> + <grid-lanes-track><y style="height:6px" class="c1"></y></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> + <grid-lanes-track></grid-lanes-track> </div> </div> <script> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-002.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout fragmentation</title> + <title>CSS Grid Test: Grid Lanes layout fragmentation</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-fragmentation-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-003-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Grid axis fragmentation with column masonry layout</title> + <title>Reference: Grid axis fragmentation with column grid-lanes layout</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -47,7 +47,7 @@ z { background: gray; width: 40px; } -masonry-track { +grid-lanes-track { display: grid; justify-content: start; column-gap: 5px; @@ -58,44 +58,44 @@ masonry-track { <wrapper style="display:none"> <div class="columns" style="height:90px"> <div class="grid"> - <masonry-track><x></x><y></y><y></y><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><z></z><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><z></z><z></z><x></x><z></z></grid-lanes-track> </div> </div> <div class="columns" style="height:68px"> <div class="grid"> - <masonry-track><x></x><y></y><y></y><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><z></z><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><z></z><z></z><x></x><z></z></grid-lanes-track> </div> </div> <div class="columns" style="height:48px"> <div class="grid"> - <masonry-track><x></x><y></y><y></y><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><z></z><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><z></z><z></z><x></x><z></z></grid-lanes-track> </div> </div> <div class="columns" style="height:38px"> <div class="grid"> - <masonry-track><x></x><y></y><y></y><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><z></z><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><z></z><z></z><x></x><z></z></grid-lanes-track> </div> </div> <div class="columns" style="height:28px"> <div class="grid"> - <masonry-track><x></x><y></y><y></y><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><z></z><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><z></z><z></z><x></x><z></z></grid-lanes-track> </div> </div> <div class="columns" style="height:18px"> <div class="grid"> - <masonry-track><x></x><y></y><y></y><x></x></masonry-track> - <masonry-track><x></x><x></x><x></x><z></z></masonry-track> - <masonry-track><z></z><z></z><x></x><z></z></masonry-track> + <grid-lanes-track><x></x><y></y><y></y><x></x></grid-lanes-track> + <grid-lanes-track><x></x><x></x><x></x><z></z></grid-lanes-track> + <grid-lanes-track><z></z><z></z><x></x><z></z></grid-lanes-track> </div> </div> </wrapper> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/fragmentation/grid-lanes-fragmentation-003.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Grid axis fragmentation with column masonry layout</title> + <title>CSS Grid Test: Grid axis fragmentation with column grid-lanes layout</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-fragmentation-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/column-gaps-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/column-gaps-001-ref.html @@ -47,7 +47,7 @@ } </style> <body> - <p>Test that gaps are correctly used within masonry containers.</p> + <p>Test that gaps are correctly used within grid-lanes containers.</p> <div class="grid"> <div class="flex"> <div class="grid-auto-item-1" style="grid-column: 1">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/column-gaps-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/column-gaps-001.html @@ -38,7 +38,7 @@ } </style> <body> - <p>Test that gaps are correctly used within masonry containers.</p> + <p>Test that gaps are correctly used within grid-lanes containers.</p> <div class="grid-lanes"> <div class="auto-item">This is some text</div> <div class="auto-item">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with definite `gap` in both axes</title> + <title>Reference: Grid Lanes layout with definite `gap` in both axes</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-001.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with definite `gap` in both axes</title> + <title>CSS Grid Test: Grid Lanes 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-3/#alignment"> <link rel="match" href="grid-lanes-gap-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-002-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> -<title>Reference: Masonry layout with normal `gap` in both axes</title> +<title>Reference: Grid Lanes 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> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/grid-lanes-gap-002.html @@ -5,12 +5,12 @@ --> <html><head> <meta charset="utf-8"> -<title>CSS Grid Test: Masonry layout with normal `gap` in both axes</title> +<title>CSS Grid Test: Grid Lanes 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"> + and inherits as 'normal' in grid-lanes 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"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/row-gaps-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/row-gaps-001-ref.html @@ -41,7 +41,7 @@ } </style> <body> - <p>Test that gaps are correctly used within masonry containers.</p> + <p>Test that gaps are correctly used within grid-lanes containers.</p> <div class="grid"> <div class="auto-item">This is some text</div> <div class="auto-item">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/row-gaps-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/gap/row-gaps-001.html @@ -43,7 +43,7 @@ } </style> <body> - <p>Test that gaps are correctly used within masonry containers.</p> + <p>Test that gaps are correctly used within grid-lanes containers.</p> <div class="grid-lanes"> <div class="auto-item">This is some text</div> <div class="auto-item">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-lanes-fieldset-crash.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-lanes-fieldset-crash.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML> <meta charset="utf-8"> -<title>Making a fieldset a masonry should not crash</title> +<title>Making a fieldset a grid-lanes should not crash</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://issues.chromium.org/issues/449017553"> <fieldset style="display: grid-lanes;"></fieldset> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-lanes-grid-template-columns-computed-withcontent.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-lanes-grid-template-columns-computed-withcontent.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>CSS Masonry Test: getComputedStyle().gridTemplateColumns</title> + <title>CSS Grid Lanes Test: getComputedStyle().gridTemplateColumns</title> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-template-masonry"> <meta name="assert" content="grid-template-columns computed value is the keyword none or a computed track list."> <script src="/resources/testharness.js"></script> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-lanes-not-inhibited-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-lanes-not-inhibited-001.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML> <meta charset="utf-8"> -<title>CSS Grid Test: Masonry layout shouldn't be inhibited simply due to being an independent formatting context (unlike subgrid)</title> +<title>CSS Grid Test: Grid Lanes layout shouldn't be inhibited simply due to being an independent formatting context (unlike subgrid)</title> <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#grid-template-masonry"> <link rel="match" href="grid-lanes-not-inhibited-001-ref.html"> @@ -23,8 +23,8 @@ item { background: cyan; } .tall { - /* This item is taller than the others, which lets us know if masonry - layout is being applied or not. If we're using masonry, then the second + /* This item is taller than the others, which lets us know if grid-lanes + layout is being applied or not. If we're using grid-lanes, then the second and third items will stack in the same column. If not, then the third item will automatically fill in below this tall item. */ height: 60px; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-001-ref.html @@ -37,7 +37,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-001.html @@ -39,7 +39,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-002-ref.html @@ -30,7 +30,7 @@ } </style> <body> - <p>Test that orthoganal masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that orthoganal grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-002.html @@ -32,7 +32,7 @@ } </style> <body> - <p>Test that orthoganal masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that orthoganal grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-003-ref.html @@ -41,7 +41,7 @@ } </style> <body> - <p>Test that orthoganal masonry with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> + <p>Test that orthoganal grid-lanes with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> <div class="grid"> <div class="flex"> <div class="first-track">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/column-explicit-placement-003.html @@ -38,7 +38,7 @@ } </style> <body> - <p>Test that orthoganal masonry with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> + <p>Test that orthoganal grid-lanes with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="first-track" style="margin-right: 10px;">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Definite column placement in a masonry grid (single edge)</title> + <title>Reference: Definite column placement in a grid-lanes grid (single edge)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> body,html { color:black; background:white; font-size:15px/1 monospace; padding:0; margin:0; } diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-001.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Definite column placement in a masonry grid (single edge)</title> + <title>CSS Grid Test: Definite column placement in a grid-lanes grid (single edge)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#grid-template-masonry"> <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-placement-int"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-002-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Definite column placement in a masonry grid (double edge)</title> + <title>Reference: Definite column placement in a grid-lanes grid (double edge)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> body,html { color:black; background:white; font:15px/1 monospace; padding:0; margin:0; } diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/grid-lanes-grid-placement-named-lines-002.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Definite column placement in a masonry grid (double edge)</title> + <title>CSS Grid Test: Definite column placement in a grid-lanes grid (double edge)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#grid-template-masonry"> <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-placement-int"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-001-ref.html @@ -30,7 +30,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-001.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-explicit-placement-001-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> @@ -31,7 +30,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-002-ref.html @@ -36,7 +36,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-002.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-explicit-placement-002-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> @@ -36,7 +35,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-003-ref.html @@ -31,7 +31,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-003.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-explicit-placement-003-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> @@ -32,7 +31,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-004-ref.html @@ -31,7 +31,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-004.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-explicit-placement-004-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> @@ -32,7 +31,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-005-ref.html @@ -30,7 +30,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div id="grid"> <div id="first-item" class="first-track" style="width: fit-content">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-005.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-explicit-placement-005-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> @@ -33,7 +32,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-006-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-006-ref.html @@ -33,7 +33,7 @@ } </style> <body> - <p>Test that orthoganal masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that orthoganal grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-006.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-006.html @@ -33,7 +33,7 @@ } </style> <body> - <p>Test that orthoganal masonry items with explicit placement are correctly positioned within the grid axis.</p> + <p>Test that orthoganal grid-lanes items with explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-007-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-007-ref.html @@ -30,7 +30,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis, with an orthogonal item.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis, with an orthogonal item.</p> <div id="grid"> <div id="first-item" class="first-track" style="writing-mode: vertical-rl; width: fit-content;"> This is some text diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-007.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-007.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-explicit-placement-007-ref.html"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> @@ -33,7 +32,7 @@ } </style> <body> - <p>Test that masonry items with explicit placement are correctly positioned within the grid axis, with an orthogonal item.</p> + <p>Test that grid-lanes items with explicit placement are correctly positioned within the grid axis, with an orthogonal item.</p> <div class="grid-lanes"> <div class="first-track" style="writing-mode: vertical-rl;">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-008-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-008-ref.html @@ -43,7 +43,7 @@ } </style> <body> - <p>Test that orthoganal masonry with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> + <p>Test that orthoganal grid-lanes with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> <div class="grid"> <div class="flex"> <div class="first-track">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-008.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/grid-placement/row-explicit-placement-008.html @@ -34,7 +34,7 @@ } </style> <body> - <p>Test that orthoganal masonry with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> + <p>Test that orthoganal grid-lanes with explicit placement are correctly positioned within the grid axis and that the margins on the orthogonal items correctly affect track sizing.</p> <div class="grid-lanes"> <div class="first-track">This is some text</div> <div class="first-track" style="margin-right: 10px;">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/column-intrinsic-inline-container-size-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/column-intrinsic-inline-container-size-ref.html @@ -27,7 +27,7 @@ } </style> <body> - <p>Test that masonry containers are correctly sized when an intrinsic inline size is specified.</p> + <p>Test that grid-lanes containers are correctly sized when an intrinsic inline size is specified.</p> <div class="grid" style="width: max-content"> <div class="first-track">This is some text</div> <div class="second-track">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/column-intrinsic-inline-container-size.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/column-intrinsic-inline-container-size.html @@ -29,7 +29,7 @@ } </style> <body> - <p>Test that masonry containers are correctly sized when an intrinsic inline size is specified.</p> + <p>Test that grid-lanes containers are correctly sized when an intrinsic inline size is specified.</p> <div class="grid-lanes" style="width: max-content"> <div class="first-track" style="width: max-content">This is some text</div> <div class="second-track" style="width: max-content">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-auto-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-auto.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-001-auto-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-fr-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-fr.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-001-fr-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix1-ref.html @@ -5,12 +5,12 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes 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> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix1.html @@ -5,14 +5,14 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-001-mix1-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix2-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-001-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-001-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-auto-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-auto.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-002-auto-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-fr-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-fr.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-002-fr-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix1-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix1.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-002-mix1-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix2-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-002-mix2.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-002-mix2-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-auto-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-auto.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-003-auto-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-fr-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-fr.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-003-fr-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix1-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix1.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-003-mix1-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix2-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-003-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-003-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-auto-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-auto.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-004-auto-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-fr-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-fr.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-004-fr-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix1-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix1.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-004-mix1-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix2-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-004-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-004-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-005-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout row sizing (vertical writing mode)</title> + <title>Reference: Grid Lanes layout row sizing (vertical writing mode)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-005.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout row sizing (vertical writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout row sizing (vertical writing mode)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-005-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-006-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-006-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout row auto-fill sizing</title> + <title>Reference: Grid Lanes layout row auto-fill sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-006.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-006.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout row auto-fill sizing</title> + <title>CSS Grid Test: Grid Lanes layout row auto-fill sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-006-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-007-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-007-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - intrinsic</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-007.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-cols-007.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - intrinsic</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-cols-007-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-auto-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-auto.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-001-auto-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-fr-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-fr.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-001-fr-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix1-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix1.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-001-mix1-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix2-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-001-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - intrinsic</title> + <title>CSS Grid Test: Grid Lanes 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-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-001-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-auto-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-auto.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-002-auto-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-fr-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-fr.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-002-fr-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix1-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix1.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-002-mix1-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix2-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout intrinsic sizing</title> + <title>Reference: Grid Lanes layout intrinsic sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-002-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content constraint</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content constraint</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-002-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-auto-ref.html @@ -6,12 +6,12 @@ <!-- WARNING: The interaction of writing-mode and min-content sizing seems to be a bit hazy. It's not clear if this is a correct reference. --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-auto.html @@ -5,14 +5,14 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-003-auto-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-fr-ref.html @@ -6,12 +6,12 @@ <!-- WARNING: The interaction of writing-mode and min-content sizing seems to be a bit hazy. It's not clear if this is a correct reference. --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-fr.html @@ -5,14 +5,14 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-003-fr-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix1-ref.html @@ -6,12 +6,12 @@ <!-- WARNING: The interaction of writing-mode and min-content sizing seems to be a bit hazy. It's not clear if this is a correct reference. --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix1.html @@ -5,14 +5,14 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-003-mix1-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix2-ref.html @@ -6,11 +6,11 @@ <!-- WARNING: The interaction of writing-mode and min-content sizing seems to be a bit hazy. It's not clear if this is a correct reference. --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout min-content sizing</title> + <title>Reference: Grid Lanes layout min-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-003-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - min-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - min-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-003-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-auto-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-auto-ref.html @@ -5,12 +5,12 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-auto.html @@ -5,14 +5,14 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-004-auto-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-fr-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-fr-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-fr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-fr.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-004-fr-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix1-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix1-ref.html @@ -5,12 +5,12 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix1.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix1.html @@ -5,14 +5,14 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-004-mix1-ref.html"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix2-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix2-ref.html @@ -5,11 +5,11 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout max-content sizing</title> + <title>Reference: Grid Lanes layout max-content sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix2.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-004-mix2.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column sizing - max-content</title> + <title>CSS Grid Test: Grid Lanes layout column sizing - max-content</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-004-mix2-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: inline-grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-005-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout row sizing (vertical writing mode)</title> + <title>Reference: Grid Lanes layout row sizing (vertical writing mode)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-005.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout row sizing (vertical writing mode)</title> + <title>CSS Grid Test: Grid Lanes layout row sizing (vertical writing mode)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-005-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-006-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-006-ref.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>Reference: Masonry layout row auto-fill sizing</title> + <title>Reference: Grid Lanes layout row auto-fill sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-006.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-006.html @@ -5,7 +5,7 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout row auto-fill sizing</title> + <title>CSS Grid Test: Grid Lanes layout row auto-fill sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-006-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-007-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-007-ref.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column width sizing</title> + <title>CSS Grid Test: Grid Lanes layout column width sizing</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-007.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: grid; @@ -32,7 +32,7 @@ item { <body> -<grid title="Ensure a width is applied in a column masonry layout when the item's width is auto"> +<grid title="Ensure a width is applied in a column grid-lanes layout when the item's width is auto"> <item style="grid-column: 1;">1</item> <item style="grid-column: 2;">5</item> <item style="grid-column: 1;">2</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-007.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/grid-lanes-intrinsic-sizing-rows-007.html @@ -5,13 +5,13 @@ --> <html> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout column width sizing</title> + <title>CSS Grid Test: Grid Lanes layout column width sizing</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#track-sizing"> <link rel="match" href="grid-lanes-intrinsic-sizing-rows-007-ref.html"> <style> -@import "support/masonry-intrinsic-sizing-visual.css"; +@import "support/grid-lanes-intrinsic-sizing-visual.css"; grid { display: grid-lanes; @@ -32,7 +32,7 @@ item { <body> -<grid title="Ensure a width is applied in a column masonry layout when the item's width is auto"> +<grid title="Ensure a width is applied in a column grid-lanes layout when the item's width is auto"> <item>1</item> <item>2</item> <item>3</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/row-defined-height-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/row-defined-height-ref.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <style> .grid { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/row-intrinsic-inline-container-size-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/row-intrinsic-inline-container-size-ref.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <style> .grid { @@ -23,7 +22,7 @@ } </style> <body> - <p>Test that masonry containers are correctly sized when an intrinsic inline size is specified.</p> + <p>Test that grid-lanes containers are correctly sized when an intrinsic inline size is specified.</p> <div class="grid" style="width: max-content"> <div class="flex"> <div class="first-track max-content-item">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/row-intrinsic-inline-container-size.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/intrinsic-sizing/row-intrinsic-inline-container-size.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<link href="resources/masonry.css" rel="stylesheet"> <link rel="match" href="row-intrinsic-inline-container-size-ref.html"> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <style> @@ -20,7 +19,7 @@ } </style> <body> - <p>Test that masonry containers are correctly sized when an intrinsic inline size is specified.</p> + <p>Test that grid-lanes containers are correctly sized when an intrinsic inline size is specified.</p> <div class="grid-lanes" style="width: max-content;"> <div class="first-track max-content-item">This is some text</div> <div class="second-track max-content-item">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-auto-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-auto-placement-001-ref.html @@ -44,7 +44,7 @@ } </style> <body> - <p>Test that masonry items with auto placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with auto placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="flex"> <div class="grid-auto-item-1" style="grid-column: 1">This is some text</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-auto-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-auto-placement-001.html @@ -38,7 +38,7 @@ } </style> <body> - <p>Test that masonry items with auto placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with auto placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="auto-item">This is some text</div> <div class="auto-item">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-reverse-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-reverse-001-ref.html @@ -8,7 +8,7 @@ } </style> <body> - <p>Test that masonry items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div style="background: lightgreen; height: 20px;">3</div> <div style="background: lightskyblue; height: 20px;">2</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-reverse-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/column-reverse-001.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Test that masonry items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div style="background: lavender; height: 20px;">1</div> <div style="background: lightskyblue; height: 20px;">2</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-001-ref.html @@ -12,7 +12,7 @@ html,body { } </style> <body> - <p>Ensure that dense-packing places items correctly in masonry.</p> + <p>Ensure that dense-packing places items correctly in grid-lanes.</p> <div class="grid"> <div> <div style="background: lightskyblue; height: 20px;" > diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-001.html @@ -15,7 +15,7 @@ html,body { } </style> <body> - <p>Ensure that dense-packing places items correctly in masonry.</p> + <p>Ensure that dense-packing places items correctly in grid-lanes.</p> <div class="grid-lanes"> <div style="background: lightskyblue; height: 20px;" > 1 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-005-ref.html @@ -6,7 +6,7 @@ position: relative; item-tolerance: 0; grid-template-columns: repeat(3, 50px); - grid-template-rows: masonry; + grid-template-rows: grid-lanes; grid-auto-flow: dense; } </style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-006-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-006-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with a specified track into track openings in that same specified track.</p> + <p>Ensure that dense-packing in grid-lanes only places items with a specified track into track openings in that same specified track.</p> <div class="grid"> <div style="background: brown; height: 20px;"></div> <div style="background: brown; height: 40px; grid-column: 2;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-006.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-006.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with a specified track into track openings in that same specified track.</p> + <p>Ensure that dense-packing in grid-lanes only places items with a specified track into track openings in that same specified track.</p> <div class="grid-lanes"> <div style="background: brown; height: 20px;"></div> <div style="background: brown; height: 40px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-004-ref.html @@ -8,7 +8,7 @@ } </style> <body> - <p>Ensure that dense-packing with multi-span items follows the masonry dense packing algorithm.</p> + <p>Ensure that dense-packing with multi-span items follows the grid-lanes dense packing algorithm.</p> <div class="grid"> <div style="background: brown; height: 80px;"></div> <div style="background: brown; height: 60px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-004.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Ensure that dense-packing with multi-span items follows the masonry dense packing algorithm.</p> + <p>Ensure that dense-packing with multi-span items follows the grid-lanes dense packing algorithm.</p> <div class="grid-lanes"> <div style="background: brown; height: 80px;"></div> <div style="background: brown; height: 60px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-007-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-007-ref.html @@ -8,7 +8,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry properly handles "split" track openings.</p> + <p>Ensure that dense-packing in grid-lanes properly handles "split" track openings.</p> <div class="grid"> <div style="background: brown; height: 80px;"></div> <div style="background: brown; height: 20px; grid-column: span 2"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-007.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-007.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry properly handles "split" track openings.</p> + <p>Ensure that dense-packing in grid-lanes properly handles "split" track openings.</p> <div class="grid-lanes"> <div style="background: brown; height: 80px;"></div> <div style="background: brown; height: 20px; grid-column: span 2"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-008-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-008-ref.html @@ -7,7 +7,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with specified tracks into track openings in those same specified tracks.</p> + <p>Ensure that dense-packing in grid-lanes only places items with specified tracks into track openings in those same specified tracks.</p> <div class="grid"> <div style="background: brown; height: 20px; grid-column: span 2; grid-row: 1;"></div> <div style="background: darkgoldenrod; height: 20px; grid-column: span 4;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-008.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/column-dense-packing-multi-span-008.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with specified tracks into track openings in those same specified tracks.</p> + <p>Ensure that dense-packing in grid-lanes only places items with specified tracks into track openings in those same specified tracks.</p> <div class="grid-lanes"> <div style="background: brown; height: 20px; grid-column: span 2;"></div> <div style="background: darkgoldenrod; height: 20px; grid-column: span 4;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-001-ref.html @@ -17,7 +17,7 @@ } </style> <body> - <p>Ensure that dense-packing places items correctly in masonry.</p> + <p>Ensure that dense-packing places items correctly in grid-lanes.</p> <div class="grid"> <div class="flex"> <div style="background: lightskyblue; width: 20px;" > diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-001.html @@ -15,7 +15,7 @@ } </style> <body> - <p>Ensure that dense-packing places items correctly in masonry.</p> + <p>Ensure that dense-packing places items correctly in grid-lanes.</p> <div class="grid-lanes"> <div style="background: lightskyblue; width: 20px;" > 1 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-004-ref.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with a specified track into track openings in that same specified track.</p> + <p>Ensure that dense-packing in grid-lanes only places items with a specified track into track openings in that same specified track.</p> <div class="grid"> <div style="background: brown; width: 20px;"></div> <div style="background: brown; width: 40px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-004.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with a specified track into track openings in that same specified track.</p> + <p>Ensure that dense-packing in grid-lanes only places items with a specified track into track openings in that same specified track.</p> <div class="grid-lanes"> <div style="background: brown; width: 20px;"></div> <div style="background: brown; width: 40px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-multi-span-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-multi-span-004-ref.html @@ -9,7 +9,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with specified tracks into track openings in those same specified tracks.</p> + <p>Ensure that dense-packing in grid-lanes only places items with specified tracks into track openings in those same specified tracks.</p> <div class="grid"> <div style="background: brown; width: 20px; grid-row: span 2;"></div> <div style="background: pink; width: 20px; grid-row: span 2;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-multi-span-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/dense-packing/row-dense-packing-multi-span-004.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Ensure that dense-packing in masonry only places items with specified tracks into track openings in those same specified tracks.</p> + <p>Ensure that dense-packing in grid-lanes only places items with specified tracks into track openings in those same specified tracks.</p> <div class="grid-lanes"> <div style="background: brown; width: 20px; grid-row: span 2;"></div> <div style="background: darkgoldenrod; width: 20px; grid-row: span 4;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout using `grid-column/row`</title> + <title>Reference: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-001.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout using `grid-column/row`</title> + <title>CSS Grid Test: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-002-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout using `grid-column/row`</title> + <title>Reference: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-002.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout using `grid-column/row`</title> + <title>CSS Grid Test: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-003-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout using `grid-column/row` and `dense`</title> + <title>Reference: Grid Lanes layout using `grid-column/row` and `dense`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -16,7 +16,6 @@ grid { display: inline-grid; gap: 10px 20px; grid-auto-columns: 80px; - grid-template-rows: masonry; color: #444; border: 1px solid; padding: 2px; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-003.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout using `grid-column/row` and `dense`</title> + <title>CSS Grid Test: Grid Lanes layout using `grid-column/row` and `dense`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-004-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout using `grid-column/row`</title> + <title>Reference: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-004.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout using `grid-column/row`</title> + <title>CSS Grid Test: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-004-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-005-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout using `grid-column/row`</title> + <title>Reference: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-005.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout using `grid-column/row`</title> + <title>CSS Grid Test: Grid Lanes layout using `grid-column/row`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-005-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-006-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-006-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry item placement</title> + <title>Reference: Grid Lanes item placement</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-006.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-006.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry item placement</title> + <title>CSS Grid Test: Grid Lanes item placement</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-006-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-007-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-007-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry item placement (RTL)</title> + <title>Reference: Grid Lanes item placement (RTL)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-007.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-007.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry item placement (RTL)</title> + <title>CSS Grid Test: Grid Lanes item placement (RTL)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-007-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-008-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-008-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry item placement w/ Images</title> + <title>CSS Grid Test: Grid Lanes item placement w/ Images</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> </head> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-008.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-item-placement-008.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry item placement w/ Images</title> + <title>CSS Grid Test: Grid Lanes item placement w/ Images</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-item-placement-008-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-rows-with-grid-width-changed-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-rows-with-grid-width-changed-ref.html @@ -3,13 +3,12 @@ <head> <link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<meta name="assert" content="When the width of the masonry grid changes, items are repositioned with correct offsets and are not overlapping"> +<meta name="assert" content="When the width of the grid-lanes grid changes, items are repositioned with correct offsets and are not overlapping"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> grid { display: grid; width: 1%; - grid-template-rows: masonry; grid-template-columns: auto; grid-gap: 10px; font-family: Ahem; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-rows-with-grid-width-changed.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/grid-lanes-rows-with-grid-width-changed.html @@ -5,7 +5,7 @@ <link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-rows-with-grid-width-changed-ref.html"> -<meta name="assert" content="When the width of the masonry grid changes, items are repositioned with correct offsets and are not overlapping"> +<meta name="assert" content="When the width of the grid-lanes grid changes, items are repositioned with correct offsets and are not overlapping"> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> <style> grid { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-initial-item-tolerance-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-initial-item-tolerance-ref.html @@ -17,7 +17,7 @@ } </style> <body> - <p>Test that the initial tie threshold for masonry is correctly resolved.</p> + <p>Test that the initial tie threshold for grid-lanes is correctly resolved.</p> <div class="grid"> <div class="flex"> <div style="background: lightskyblue; height: 100px"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-initial-item-tolerance.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-initial-item-tolerance.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <meta charset="utf-8"> -<title>CSS Masonry Test: Initial value of item-tolerance</title> +<title>CSS Grid Lanes Test: Initial value of item-tolerance</title> <link rel="author" title="Ethan Jimenez" href="mailto:ethavar@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-slack"> <link rel="match" href="column-initial-item-tolerance-ref.html"> @@ -39,7 +39,7 @@ } </style> <body> - <p>Test that the initial tie threshold for masonry is correctly resolved.</p> + <p>Test that the initial tie threshold for grid-lanes is correctly resolved.</p> <div class="grid-lanes"> <div class="auto-item" style="height: 80px"></div> <div class="auto-item" style="height: 30px"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-item-tolerance-infinite-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-item-tolerance-infinite-ref.html @@ -25,7 +25,7 @@ } </style> <body> - <p>Test that the infinite tie threshold for masonry is correctly resolved.</p> + <p>Test that the infinite tie threshold for grid-lanes is correctly resolved.</p> <div class="grid"> <div class="flex"> <div class="auto-item" style="height: 40px">1</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-item-tolerance-infinite.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/column-item-tolerance-infinite.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <meta charset="utf-8"> -<title>CSS Masonry Test: Infinite value of item-tolerance</title> +<title>CSS Grid Lanes Test: Infinite value of item-tolerance</title> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-slack"> <link rel="match" href="column-item-tolerance-infinite-ref.html"> @@ -26,7 +26,7 @@ } </style> <body> - <p>Test that the infinite tie threshold for masonry is correctly resolved.</p> + <p>Test that the infinite tie threshold for grid-lanes is correctly resolved.</p> <div class="grid-lanes"> <div class="auto-item" style="height: 40px">1</div> <div class="auto-item" style="height: 30px">2</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-001-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal (reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal (reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-001.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-column-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-002-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal (reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal (reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-002.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-column-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-003-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: 51px (reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: 51px (reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-003.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: 51px</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: 51px</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-column-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-004-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: infinite (reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: infinite (reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-column-004.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: infinite</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: infinite</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-column-004-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-001-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal (row direction - reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal (row direction - reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-001.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal (row direction)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal (row direction)</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-row-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-002-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal (row direction - reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal (row direction - reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-002.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: normal (row direction)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: normal (row direction)</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-row-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-003-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: 51px (row direction - reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: 51px (row direction - reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-003.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: 51px (row direction)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: 51px (row direction)</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-row-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-004-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: infinite (row direction - reference)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: infinite (row direction - reference)</title> <style> html,body { color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/item-tolerance-row-004.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with item-tolerance: infinite (row direction)</title> + <title>CSS Grid Test: Grid Lanes layout with item-tolerance: infinite (row direction)</title> <link rel="author" title="Apple Inc."> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-tolerance"> <link rel="match" href="item-tolerance-row-004-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-initial-item-tolerance-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-initial-item-tolerance-ref.html @@ -40,7 +40,7 @@ } </style> <body> - <p>Test that the initial tie threshold for masonry is correctly resolved.</p> + <p>Test that the initial tie threshold for grid-lanes is correctly resolved.</p> <div class="grid"> <div class="auto-item" style="width: 80px"></div> <div class="auto-item" style="width: 30px"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-initial-item-tolerance.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-initial-item-tolerance.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <meta charset="utf-8"> -<title>CSS Masonry Test: Initial value of item-tolerance</title> +<title>CSS Grid Lanes Test: Initial value of item-tolerance</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-slack"> <link rel="match" href="row-initial-item-tolerance-ref.html"> @@ -41,7 +41,7 @@ } </style> <body> - <p>Test that the initial tie threshold for masonry is correctly resolved.</p> + <p>Test that the initial tie threshold for grid-lanes is correctly resolved.</p> <div class="grid-lanes"> <div class="auto-item" style="width: 80px"></div> <div class="auto-item" style="width: 30px"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-item-tolerance-infinite-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-item-tolerance-infinite-ref.html @@ -25,7 +25,7 @@ } </style> <body> - <p>Test that the infinite tie threshold for masonry is correctly resolved.</p> + <p>Test that the infinite tie threshold for grid-lanes is correctly resolved.</p> <div class="grid"> <div class="flex"> <div class="auto-item" style="width: 40px">1</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-item-tolerance-infinite.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/item-tolerance/row-item-tolerance-infinite.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <meta charset="utf-8"> -<title>CSS Masonry Test: Infinite value of item-tolerance</title> +<title>CSS Grid Lanes Test: Infinite value of item-tolerance</title> <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#item-slack"> <link rel="match" href="row-item-tolerance-infinite-ref.html"> @@ -26,7 +26,7 @@ } </style> <body> - <p>Test that the infinite tie threshold for masonry is correctly resolved.</p> + <p>Test that the infinite tie threshold for grid-lanes is correctly resolved.</p> <div class="grid-lanes"> <div class="auto-item" style="width: 40px">1</div> <div class="auto-item" style="width: 30px">2</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-001-ref.html @@ -26,7 +26,7 @@ } </style> <body> - <p>Test that masonry items with auto placement are correctly positioned when the grid-axis is the block axis. Ensure that margin affects placement.</p> + <p>Test that grid-lanes items with auto placement are correctly positioned when the grid-axis is the block axis. Ensure that margin affects placement.</p> <div class="grid"> <div class="flex"> <div class="square-100x100" style="background: lightskyblue; margin-right: 100px;"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-001.html @@ -36,7 +36,7 @@ } </style> <body> - <p>Test that masonry items with auto placement are correctly positioned when the grid-axis is the block axis. Ensure that margin affects placement.</p> + <p>Test that grid-lanes items with auto placement are correctly positioned when the grid-axis is the block axis. Ensure that margin affects placement.</p> <div class="grid-lanes"> <div class="first-track square-100x100" style="margin-right: 40px;"> Number 1 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-002-ref.html @@ -44,7 +44,7 @@ } </style> <body> - <p>Test that masonry items with auto placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with auto placement are correctly positioned within the grid axis.</p> <div class="grid"> <div class="grid-auto-item-1" style="grid-row: 1;">This is some text</div> <div class="grid-auto-item-2" style="grid-row: 2;">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-002.html @@ -44,7 +44,7 @@ } </style> <body> - <p>Test that masonry items with auto placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with auto placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div class="auto-item">This is some text</div> <div class="auto-item">Some larger words in this sentence</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-max-content-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-max-content-ref.html @@ -25,7 +25,7 @@ html,body { } </style> <body> - <p>Ensure that masonry containers are sized correctly under max-content constraints even if the items do not have the max-content style.</p> + <p>Ensure that grid-lanes containers are sized correctly under max-content constraints even if the items do not have the max-content style.</p> <div class="grid"> <div class="flex"> <div style="background: lightskyblue;"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-max-content.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-max-content.html @@ -20,7 +20,7 @@ html,body { } </style> <body> - <p>Ensure that masonry containers are sized correctly under max-content constraints even if the items do not have the max-content style.</p> + <p>Ensure that grid-lanes containers are sized correctly under max-content constraints even if the items do not have the max-content style.</p> <div class="grid-lanes"> <div style="background: lightskyblue;"> Number 1 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-min-content-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-min-content-ref.html @@ -17,7 +17,7 @@ html,body { } </style> <body> - <p>Ensure that masonry containers are sized correctly under min-content constraints even if the items do not have the min-content style.</p> + <p>Ensure that grid-lanes containers are sized correctly under min-content constraints even if the items do not have the min-content style.</p> <div id="shown-items" class="grid"> <div style="background: lightskyblue; width: max-content; grid-row: 1; grid-column: 1;"> Number 1 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-min-content.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-auto-placement-min-content.html @@ -20,7 +20,7 @@ html,body { } </style> <body> - <p>Ensure that masonry containers are sized correctly under min-content constraints even if the items do not have the min-content style.</p> + <p>Ensure that grid-lanes containers are sized correctly under min-content constraints even if the items do not have the min-content style.</p> <div class="grid-lanes"> <div style="background: lightskyblue;" > Number 1 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-reverse-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-reverse-001-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Test that masonry items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> <div class="grid"> <div style="background: lightgreen; width: 20px;">3</div> <div style="background: lightskyblue; width: 20px;">2</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-reverse-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/item-placement/row-reverse-001.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Test that masonry items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> + <p>Test that grid-lanes items with reverse auto placement and explicit placement are correctly positioned within the grid axis.</p> <div class="grid-lanes"> <div style="background: lavender; width: 20px;">1</div> <div style="background: lightskyblue; width: 20px;">2</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-automatic-minimum-for-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-automatic-minimum-for-auto.html @@ -1,9 +1,9 @@ <!DOCTYPE html> -<title>CSS Masonry: automatic minimum in 'auto' columns</title> +<title>CSS Grid Lanes: automatic minimum in 'auto' columns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#layout-algorithm"> <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#automatic-minimum-size"> -<meta name="assert" content="Check that masonry item's 'min-width' is honored when sizing 'auto' columns."> +<meta name="assert" content="Check that grid-lanes item's 'min-width' is honored when sizing 'auto' columns."> <link rel="stylesheet" href="/css/support/grid.css"> <link rel="stylesheet" href="/fonts/ahem.css"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-fit-content-percentage.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-fit-content-percentage.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: indefinite percentage in fit-content()</title> +<title>CSS Grid Lanes Layout Test: indefinite percentage in fit-content()</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#track-sizes" title="7.2.1. Track Sizes"> -<meta name="assert" content="Checks that an indefinite percentage in fit-content lets the masonry container grow enough to contain the max-content contribution of its masonry items."> +<meta name="assert" content="Checks that an indefinite percentage in fit-content lets the grid-lanes container grow enough to contain the max-content contribution of its grid-lanes items."> <style> .container { width: 200px; @@ -44,24 +44,24 @@ for (const use_min_width of [false, true]) { const container = document.createElement("div"); container.className = "container"; document.body.appendChild(container); - const masonry = document.createElement("div"); - masonry.className = "grid-lanes"; - masonry.style.gridTemplateColumns = value; - container.appendChild(masonry); + const gridLanes = document.createElement("div"); + gridLanes.className = "grid-lanes"; + gridLanes.style.gridTemplateColumns = value; + container.appendChild(gridLanes); const item = document.createElement("div"); item.className = "item"; item.style.minWidth = use_min_width ? "auto" : "0px"; - masonry.appendChild(item); + gridLanes.appendChild(item); test(function() { const minWidth = use_min_width ? minContent : 0; const colSize = clamp(percentage * maxContent / 100, minWidth, maxContent); const height = colSize < maxContent ? maxContent : minContent; - assert_equals(item.offsetWidth, colSize, "Masonry item width"); - assert_equals(item.offsetHeight, height, "Masonry item height"); - assert_equals(masonry.offsetWidth, maxContent, "Masonry container width"); - assert_equals(masonry.offsetHeight, height, "Masonry container height"); - assert_equals(getComputedStyle(masonry).gridTemplateColumns, colSize + "px", - "Masonry column size"); + assert_equals(item.offsetWidth, colSize, "Grid Lanes item width"); + assert_equals(item.offsetHeight, height, "Grid Lanes item height"); + assert_equals(gridLanes.offsetWidth, maxContent, "Grid Lanes container width"); + assert_equals(gridLanes.offsetHeight, height, "Grid Lanes container height"); + assert_equals(getComputedStyle(gridLanes).gridTemplateColumns, colSize + "px", + "Grid Lanes column size"); }, value + "; min-width: " + item.style.minWidth); } } diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-flex-spanning-items.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-flex-spanning-items.html @@ -1,11 +1,11 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Intrinsic sizing with spanning flex items in a min-content container</title> +<title>CSS Grid Lanes Layout Test: Intrinsic sizing with spanning flex items in a min-content container</title> <link rel="match" href="column-flex-spanning-items-ref.html"/> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#intrinsic-sizes"/> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"/> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-template-columns: 1fr 30px; border: 10px solid fuchsia; @@ -20,7 +20,7 @@ background: aqua; } </style> -<div id="masonry"> +<div id="grid-lanes"> <div id="item"> <div id="filler"></div> </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-flex-track-intrinsic-sizes.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-flex-track-intrinsic-sizes.html @@ -1,13 +1,13 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Intrinsic contribution of an item with flex tracks</title> +<title>CSS Grid Lanes Layout Test: Intrinsic contribution of an item with flex tracks</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-spanning-items"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-spanning-flex-items"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#min-size-auto"> -<meta name="assert" content="This test checks that the intrinsic contribution of a single masonry item is distributed correctly among the tracks it spans when flexible tracks are involved, and the item's size is determined by its children rather than explicitly."> +<meta name="assert" content="This test checks that the intrinsic contribution of a single grid-lanes item is distributed correctly among the tracks it spans when flexible tracks are involved, and the item's size is determined by its children rather than explicitly."> <style> -#masonry { +#grid-lanes { display: grid-lanes; width: 60px; height: 60px; @@ -26,7 +26,7 @@ <div id="log"></div> -<div id="masonry"> +<div id="grid-lanes"> <div id="item"></div> </div> @@ -38,7 +38,7 @@ const item = document.getElementById("item"); let testset = "unlabeled"; function checkTrackSizes(span, trackList, expected) { item.style.gridColumn = `span ${span}`; - TestingUtils.testGridTemplateColumns("masonry", trackList, expected, testset); + TestingUtils.testGridTemplateColumns("grid-lanes", trackList, expected, testset); } // First check for distributing auto minimum /////////////////////////////////// @@ -95,7 +95,7 @@ checkTrackSizes(2, "minmax(25px, 1fr) auto", "60px 0px"); // Now check for distributing min content ////////////////////////////////////// item.style.minWidth = "min-content"; // min-content = 100px > grid // TODO(almaher): Update to use "min-content" in the block axis for -// grid and masonry. +// grid and grid-lanes. item.style.minHeight = "100px"; // min-content doesn't resolve in block axis (yet?) testset = "min-content min item"; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-intrinsic-maximums.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-intrinsic-maximums.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <html> -<title>CSS Masonry: Masonry item intrinsic maximum sizes</title> +<title>CSS Grid Lanes: Grid Lanes item intrinsic maximum sizes</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-items"> <link href="/css/support/width-keyword-classes.css" rel="stylesheet"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-intrinsic-track-sizes-min-size.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-intrinsic-track-sizes-min-size.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Test that spanning masonry items with auto size that should not have content-based automatic minimum size.</title> +<title>CSS Grid Lanes Layout Test: Test that spanning grid-lanes items with auto size that should not have content-based automatic minimum size.</title> <link rel="match" href="../../../../reference/ref-filled-green-100px-square.xht"> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#intrinsic-sizes"/> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-intrinsic-track-sizes.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-intrinsic-track-sizes.html @@ -1,12 +1,12 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Intrinsic contribution of a small item to intrinsic tracks</title> +<title>CSS Grid Lanes Layout Test: Intrinsic contribution of a small item to intrinsic tracks</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://www.w3.org/TR/css-grid-1/#algo-content"> -<meta name="assert" content="This test checks that the intrinsic contribution of a single masonry item smaller than its container is distributed correctly among the tracks it spans when intrinsic tracks are involved."> +<meta name="assert" content="This test checks that the intrinsic contribution of a single grid-lanes item smaller than its container is distributed correctly among the tracks it spans when intrinsic tracks are involved."> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" /> <style> -#masonry { +#grid-lanes { display: grid-lanes; width: 120px; height: 120px; @@ -21,7 +21,7 @@ } </style> -<div id="masonry"> +<div id="grid-lanes"> <div id="item">XXX XX<br>XX<br>XX</div> </div> @@ -34,7 +34,7 @@ const item = document.getElementById("item"); function checkTrackSizes(span, trackList, expectedCols) { item.style.gridColumn = `span ${span}`; - TestingUtils.testGridTemplateColumns("masonry", trackList, expectedCols); + TestingUtils.testGridTemplateColumns("grid-lanes", trackList, expectedCols); } setup({ explicit_done: true }); diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-minmax-img-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-minmax-img-001.html @@ -1,19 +1,19 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>Image within a masonry with a size that depends on the containing block should stretch, but not size the grid tracks</title> +<title>Image within a grid-lanes with a size that depends on the containing block should stretch, but not size the grid tracks</title> <link rel="author" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#algo-stretch"> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#algo-single-span-items"> <link rel="match" href="../../../../reference/ref-filled-green-100px-square.xht"> <style> -#masonry { +#grid-lanes { display: inline-grid-lanes; grid-template-columns: minmax(auto, 0); width: 200px; } </style> <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> -<div id="masonry"> +<div id="grid-lanes"> <img id="img" src="support/100x100-green.png"> <div style="background-color: red; aspect-ratio: 1;"> </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-percentage-sizes-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-percentage-sizes-001.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: item [min-|max-]*[width|height] percentages</title> +<title>CSS Grid Lanes Layout Test: item [min-|max-]*[width|height] percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1"> <link rel="match" href="column-item-percentage-sizes-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-percentage-sizes-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-percentage-sizes-002.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: item [min-|max-]*[width|height] percentages</title> +<title>CSS Grid Lanes Layout Test: item [min-|max-]*[width|height] percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1"> <link rel="match" href="column-item-percentage-sizes-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-percentage-sizes-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-item-percentage-sizes-003.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: item [min-|max-]*[width|height] calc() percentages</title> +<title>CSS Grid Lanes Layout Test: item [min-|max-]*[width|height] calc() percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1"> <link rel="match" href="column-item-percentage-sizes-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-contribution-baseline-shim-vertical-lr.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-contribution-baseline-shim-vertical-lr.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: minimum contribution with baseline-alignment shim</title> +<title>CSS Grid Lanes Layout Test: minimum contribution with baseline-alignment shim</title> <link rel="author" title="Alison Maher" href="mailto:almaher@almaher.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#algo-content" title="11.5. Resolve Intrinsic Track Sizes"> -<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that masonry items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area."> +<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that grid-lanes items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area."> <style> .grid-lanes { display: grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-contribution-baseline-shim-vertical-rl.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-contribution-baseline-shim-vertical-rl.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: minimum contribution with baseline-alignment shim</title> +<title>CSS Grid Lanes Layout Test: minimum contribution with baseline-alignment shim</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#algo-content" title="11.5. Resolve Intrinsic Track Sizes"> -<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that masonry items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area."> +<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that grid-lanes items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area."> <style> .grid-lanes { display: grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-contribution-with-percentages.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-contribution-with-percentages.html @@ -1,11 +1,11 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: minimum contribution with percentages</title> +<title>CSS Grid Lanes Layout Test: minimum contribution with percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com" /> <link rel="help" href="https://drafts.csswg.org/css-grid/#minimum-contribution"> <meta name="assert" content="Checks that the minimum contribution is the minimum size when the preferred size is 'auto' or contains a percentage."> <style> -#masonry { +#grid-lanes { display: grid-lanes; height: 50px; width: 50px; @@ -32,7 +32,7 @@ } </style> <div id="log"></div> -<div id="masonry"> +<div id="grid-lanes"> <div id="item"> <div id="content"></div> </div> @@ -41,7 +41,7 @@ <script src="/resources/testharnessreport.js"></script> <script> "use strict"; -const cs = getComputedStyle(document.getElementById("masonry")); +const cs = getComputedStyle(document.getElementById("grid-lanes")); const item = document.getElementById("item"); function check(name, size) { item.className = name; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-size-grid-items-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-size-grid-items-001.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Minimum size of grid items</title> +<title>CSS Grid Lanes Layout Test: Minimum size of grid items</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items"> <link rel="match" href="../../../../reference/ref-filled-green-100px-square.xht"> @@ -14,7 +14,7 @@ z-index: -1; } -#constrained-masonry { +#constrained-grid-lanes { display: grid-lanes; width: 10px; height: 10px; @@ -34,7 +34,7 @@ <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> <div id="reference-overlapped-green"></div> -<div id="constrained-masonry"> +<div id="constrained-grid-lanes"> <div id="test-item-overlapping-red"> <div id="content-100x100"></div> </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-size-grid-items-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-size-grid-items-002.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Minimum size of items</title> +<title>CSS Grid Lanes Layout Test: Minimum size of items</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items"> <meta name="assert" content="Checks that automatic minimum size is clamped with different column sizes."> @@ -140,7 +140,7 @@ <div data-expected-width="25"></div> </div> -<h3>masonry content writing-mode: vertical-lr;</h3> +<h3>grid-lanes content writing-mode: vertical-lr;</h3> <pre>grid-template-columns: auto;</pre> @@ -247,7 +247,7 @@ <div data-expected-height="25"></div> </div> -<h3>masonry content writing-mode: vertical-rl;</h3> +<h3>grid-lanes content writing-mode: vertical-rl;</h3> <pre>grid-template-columns: auto;</pre> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-size-grid-items-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/column-minimum-size-grid-items-003.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Minimum size of items</title> +<title>CSS Grid Lanes Layout Test: Minimum size of items</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items"> <meta name="assert" content="Checks that automatic minimum size is clamped with different column sizes and spaning items."> @@ -145,7 +145,7 @@ <div data-expected-width="40"></div> </div> -<h3>masonry content writing-mode: vertical-lr;</h3> +<h3>grid-lanes content writing-mode: vertical-lr;</h3> <pre>grid-template-columns: auto auto;</pre> @@ -252,7 +252,7 @@ <div data-expected-height="40"></div> </div> -<h3>masonry content writing-mode: vertical-rl;</h3> +<h3>grid-lanes content writing-mode: vertical-rl;</h3> <pre>grid-template-columns: auto auto;</pre> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-automatic-minimum-for-auto.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-automatic-minimum-for-auto.html @@ -1,9 +1,9 @@ <!DOCTYPE html> -<title>CSS Masonry: automatic minimum in 'auto' rows</title> +<title>CSS Grid Lanes: automatic minimum in 'auto' rows</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#layout-algorithm"> <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#automatic-minimum-size"> -<meta name="assert" content="Check that masonry item's 'min-height' is honored when sizing 'auto' rows."> +<meta name="assert" content="Check that grid-lanes item's 'min-height' is honored when sizing 'auto' rows."> <link rel="stylesheet" href="/css/support/grid.css"> <link rel="stylesheet" href="/fonts/ahem.css"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-flex-spanning-items.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-flex-spanning-items.html @@ -1,11 +1,11 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Intrinsic sizing with spanning flex items in a min-content container</title> +<title>CSS Grid Lanes Layout Test: Intrinsic sizing with spanning flex items in a min-content container</title> <link rel="match" href="row-flex-spanning-items-ref.html"/> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#intrinsic-sizes"/> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"/> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-lanes-direction: row; grid-template-rows: 1fr 30px; @@ -21,7 +21,7 @@ background: aqua; } </style> -<div id="masonry"> +<div id="grid-lanes"> <div id="item"> <div id="filler"></div> </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-flex-track-intrinsic-sizes.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-flex-track-intrinsic-sizes.html @@ -1,13 +1,13 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Intrinsic contribution of an item with flex tracks</title> +<title>CSS Grid Lanes Layout Test: Intrinsic contribution of an item with flex tracks</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-spanning-items"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-spanning-flex-items"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#min-size-auto"> -<meta name="assert" content="This test checks that the intrinsic contribution of a single masonry item is distributed correctly among the tracks it spans when flexible tracks are involved, and the item's size is determined by its children rather than explicitly."> +<meta name="assert" content="This test checks that the intrinsic contribution of a single grid-lanes item is distributed correctly among the tracks it spans when flexible tracks are involved, and the item's size is determined by its children rather than explicitly."> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-lanes-direction: row; width: 60px; @@ -27,7 +27,7 @@ <div id="log"></div> -<div id="masonry"> +<div id="grid-lanes"> <div id="item"></div> </div> @@ -39,7 +39,7 @@ const item = document.getElementById("item"); let testset = "unlabeled"; function checkTrackSizes(span, trackList, expected) { item.style.gridRow = `span ${span}`; - TestingUtils.testGridTemplateRows("masonry", trackList, expected, testset); + TestingUtils.testGridTemplateRows("grid-lanes", trackList, expected, testset); } // First check for distributing auto minimum /////////////////////////////////// diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-intrinsic-track-sizes.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-intrinsic-track-sizes.html @@ -1,12 +1,12 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Intrinsic contribution of a small item to intrinsic tracks</title> +<title>CSS Grid Lanes Layout Test: Intrinsic contribution of a small item to intrinsic tracks</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://www.w3.org/TR/css-grid-1/#algo-content"> -<meta name="assert" content="This test checks that the intrinsic contribution of a single masonry item smaller than its container is distributed correctly among the tracks it spans when intrinsic tracks are involved."> +<meta name="assert" content="This test checks that the intrinsic contribution of a single grid-lanes item smaller than its container is distributed correctly among the tracks it spans when intrinsic tracks are involved."> <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" /> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-lanes-direction: row; width: 120px; @@ -22,7 +22,7 @@ } </style> -<div id="masonry"> +<div id="grid-lanes"> <div id="item">XXX XX<br>XX<br>XX</div> </div> @@ -35,7 +35,7 @@ const item = document.getElementById("item"); function checkTrackSizes(span, trackList, expectedRows) { item.style.gridRow = `span ${span}`; - TestingUtils.testGridTemplateRows("masonry", trackList, expectedRows); + TestingUtils.testGridTemplateRows("grid-lanes", trackList, expectedRows); } setup({ explicit_done: true }); diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-minmax-img-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-minmax-img-001.html @@ -1,12 +1,12 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>Image within a masonry with a size that depends on the containing block should stretch, but not size the grid tracks</title> +<title>Image within a grid-lanes with a size that depends on the containing block should stretch, but not size the grid tracks</title> <link rel="author" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#algo-stretch"> <link rel="help" href="https://drafts.csswg.org/css-grid-2/#algo-single-span-items"> <link rel="match" href="../../../../reference/ref-filled-green-100px-square.xht"> <style> -#masonry { +#grid-lanes { display: inline-grid-lanes; grid-lanes-direction: row; grid-template-rows: minmax(auto, 0); @@ -14,7 +14,7 @@ } </style> <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> -<div id="masonry"> +<div id="grid-lanes"> <img id="img" src="support/100x100-green.png"> <div style="background-color: red; aspect-ratio: 1;"> </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-percentage-sizes-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-percentage-sizes-001.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: item [min-|max-]*[width|height] percentages</title> +<title>CSS Grid Lanes Layout Test: item [min-|max-]*[width|height] percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1"> <link rel="match" href="row-item-percentage-sizes-001-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-percentage-sizes-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-percentage-sizes-002.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: item [min-|max-]*[width|height] percentages</title> +<title>CSS Grid Lanes Layout Test: item [min-|max-]*[width|height] percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1"> <link rel="match" href="row-item-percentage-sizes-002-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-percentage-sizes-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-item-percentage-sizes-003.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: item [min-|max-]*[width|height] calc() percentages</title> +<title>CSS Grid Lanes Layout Test: item [min-|max-]*[width|height] calc() percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1"> <link rel="match" href="row-item-percentage-sizes-003-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-contribution-baseline-shim.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-contribution-baseline-shim.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: minimum contribution with baseline-alignment shim</title> +<title>CSS Grid Lanes Layout Test: minimum contribution with baseline-alignment shim</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#algo-content" title="11.5. Resolve Intrinsic Track Sizes"> -<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that masonry items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area."> +<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that grid-lanes items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area."> <style> .grid-lanes { display: grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-contribution-with-percentages.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-contribution-with-percentages.html @@ -1,11 +1,11 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: minimum contribution with percentages</title> +<title>CSS Grid Lanes Layout Test: minimum contribution with percentages</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com" /> <link rel="help" href="https://drafts.csswg.org/css-grid/#minimum-contribution"> <meta name="assert" content="Checks that the minimum contribution is the minimum size when the preferred size is 'auto' or contains a percentage."> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-lanes-direction: row; height: 50px; @@ -33,7 +33,7 @@ } </style> <div id="log"></div> -<div id="masonry"> +<div id="grid-lanes"> <div id="item"> <div id="content"></div> </div> @@ -42,7 +42,7 @@ <script src="/resources/testharnessreport.js"></script> <script> "use strict"; -const cs = getComputedStyle(document.getElementById("masonry")); +const cs = getComputedStyle(document.getElementById("grid-lanes")); const item = document.getElementById("item"); function check(name, size) { item.className = name; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-size-grid-items-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-size-grid-items-001.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Minimum size of grid items</title> +<title>CSS Grid Lanes Layout Test: Minimum size of grid items</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items"> <link rel="match" href="../../../../reference/ref-filled-green-100px-square.xht"> @@ -14,7 +14,7 @@ z-index: -1; } -#constrained-masonry { +#constrained-grid-lanes { display: grid-lanes; grid-lanes-direction: row; width: 10px; @@ -35,7 +35,7 @@ <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> <div id="reference-overlapped-green"></div> -<div id="constrained-masonry"> +<div id="constrained-grid-lanes"> <div id="test-item-overlapping-red"> <div id="content-100x100"></div> </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-size-grid-items-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-size-grid-items-002.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Minimum size of items</title> +<title>CSS Grid Lanes Layout Test: Minimum size of items</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items"> <meta name="assert" content="Checks that automatic minimum size is clamped with different row sizes."> @@ -251,7 +251,7 @@ <div data-expected-height="25"></div> </div> -<h3>masonry container writing-mode: vertical-lr; & item writing-mode: horizontal-tb;</h3> +<h3>grid-lanes container writing-mode: vertical-lr; & item writing-mode: horizontal-tb;</h3> <pre>grid-template-rows: auto;</pre> @@ -358,7 +358,7 @@ <div data-expected-width="25"></div> </div> -<h3>masonry container writing-mode: vertical-rl; & item writing-mode: horizontal-tb;</h3> +<h3>grid-lanes container writing-mode: vertical-rl; & item writing-mode: horizontal-tb;</h3> <pre>grid-template-rows: auto;</pre> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-size-grid-items-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/items/row-minimum-size-grid-items-003.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: Minimum size of items</title> +<title>CSS Grid Lanes Layout Test: Minimum size of items</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items"> <meta name="assert" content="Checks that automatic minimum size is clamped with different row sizes and spaning items."> @@ -255,7 +255,7 @@ <div data-expected-height="40"></div> </div> -<h3>masonry container writing-mode: vertical-lr; & item writing-mode: horizontal-tb;</h3> +<h3>grid-lanes container writing-mode: vertical-lr; & item writing-mode: horizontal-tb;</h3> <pre>grid-template-rows: auto auto;</pre> @@ -362,7 +362,7 @@ <div data-expected-width="40"></div> </div> -<h3>masonry container writing-mode: vertical-rl; & item writing-mode: horizontal-tb;</h3> +<h3>grid-lanes container writing-mode: vertical-rl; & item writing-mode: horizontal-tb;</h3> <pre>grid-template-rows: auto auto;</pre> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-001-ref.html @@ -10,7 +10,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color: magenta; order: 10;">M</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-001.html @@ -13,7 +13,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color: magenta; order: 10;">M</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-002-ref.html @@ -10,7 +10,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color:magenta;">M</div> <div id="lime" style="color:lime;order:-1;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-002.html @@ -13,7 +13,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color: magenta;">M</div> <div id="lime" style="color: lime; order: -1;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-003-ref.html @@ -10,7 +10,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="lime" style="color: lime;">L</div> <div id="magenta" style="color: magenta; order: 1;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-003.html @@ -13,7 +13,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="lime" style="color: lime;">L</div> <div id="magenta" style="color: magenta; order: 1;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-004-ref.html @@ -10,7 +10,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="blue" style="color: blue; order: 1;">B</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-004.html @@ -13,7 +13,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="blue" style="color: blue; order: 1;">B</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-005-ref.html @@ -10,7 +10,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="yellow" style="color: yellow; order: -1;">Y</div> <div id="magenta" style="color: magenta; order: 5;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/column-order-property-auto-placement-005.html @@ -13,7 +13,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="yellow" style="color: yellow; order: -1;">Y</div> <div id="magenta" style="color: magenta; order: 5;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/grid-lanes-order-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/grid-lanes-order-001-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout using `order`</title> + <title>Reference: Grid Lanes layout using `order`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/grid-lanes-order-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/grid-lanes-order-001.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout using `order`</title> + <title>CSS Grid Test: Grid Lanes layout using `order`</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-layout-algorithm"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-001-ref.html @@ -12,7 +12,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color: magenta; order: 10;">M</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-001.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" /> <link rel="match" href="row-order-property-auto-placement-001-ref.html"> <style> -#masonry { +#grid-lanes { display: grid-lanes; font: 50px/1 Ahem; grid-lanes-direction: row; @@ -14,8 +14,8 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> -<div id="masonry"> +<p>Ensure `order` property affects grid-lanes layout correctly</p> +<div id="grid-lanes"> <div id="magenta" style="color: magenta; order: 10;">M</div> <div id="lime" style="color: lime; order: 5;">L</div> <div id="yellow" style="color: yellow; order: 1;">Y</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-002-ref.html @@ -12,7 +12,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color: magenta;">M</div> <div id="lime" style="color: lime; order: -1;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-002.html @@ -14,7 +14,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="magenta" style="color: magenta;">M</div> <div id="lime" style="color: lime; order: -1;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-003-ref.html @@ -12,7 +12,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="lime" style="color: lime;">L</div> <div id="magenta" style="color: magenta; order: 1;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-003.html @@ -14,7 +14,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="lime" style="color: lime;">L</div> <div id="magenta" style="color: magenta; order: 1;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-004-ref.html @@ -12,7 +12,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="blue" style="color: blue; order: 1;">B</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-004.html @@ -14,7 +14,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="blue" style="color: blue; order: 1;">B</div> <div id="lime" style="color: lime; order: 5;">L</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-005-ref.html @@ -12,7 +12,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="yellow" style="color: yellow; order: -1;">Y</div> <div id="magenta" style="color: magenta; order: 5;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/order/row-order-property-auto-placement-005.html @@ -14,7 +14,7 @@ align-content: start; } </style> -<p>Ensure `order` property affects masonry layout correctly</p> +<p>Ensure `order` property affects grid-lanes layout correctly</p> <div id="grid"> <div id="yellow" style="color: yellow; order: -1;">Y</div> <div id="magenta" style="color: magenta; order: 5;">M</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/parsing/item-tolerance-computed.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/parsing/item-tolerance-computed.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> -<title>CSS Masonry: item-tolerance getComputedStyle()</title> +<title>CSS Grid Lanes: item-tolerance getComputedStyle()</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com"> <meta name="assert" content="item-tolerance computed value is as specified."> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/parsing/item-tolerance-invalid.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/parsing/item-tolerance-invalid.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> -<title>CSS Masonry: item-tolerance parsing</title> +<title>CSS Grid Lanes: item-tolerance parsing</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com"> <meta name="assert" content="item-tolerance supports only the grammar 'normal | <length-percentage>'."> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/parsing/item-tolerance-valid.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/parsing/item-tolerance-valid.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> -<title>CSS Masonry: item-tolerance parsing</title> +<title>CSS Grid Lanes: item-tolerance parsing</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com"> <meta name="assert" content="item-tolerance supports the full grammar 'normal | <length-percentage>'."> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/row-empty-grid-lanes-container-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/row-empty-grid-lanes-container-001.html @@ -10,7 +10,7 @@ }; </style> <body> - <p>Test that an empty masonry container renders nothing.</p> + <p>Test that an empty grid-lanes container renders nothing.</p> <div class="empty-container"></div> </body> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/row-empty-grid-lanes-container-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/row-empty-grid-lanes-container-002.html @@ -14,7 +14,7 @@ } </style> <body> - <p>Test that an empty masonry container still renders padding.</p> + <p>Test that an empty grid-lanes container still renders padding.</p> <div class="grid-lanes"></div> </body> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001a-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001a-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001a)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,13 +82,13 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> -<grid style="grid:masonry/none"> +<grid style="grid:grid-lanes/none"> <item class="nth-1">1</item> <item class="purple js">2</item> <item>3</item> - <subgrid style="grid:masonry/none"> + <subgrid style="grid:grid-lanes/none"> <item class="nth-1">4a</item> <item style="margin-right:15px" class="purple js">4b</item> </subgrid> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001a.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001a.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001a)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001a-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001b-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001b-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001b)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple js">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001b.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001b.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001b)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001b-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001c-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001c-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001c)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid style="grid:subgrid/auto"> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple js">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001c.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001c.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001c)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001c-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001d-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001d-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001d)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid style="grid:subgrid/auto; grid-auto-flow:column"> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple js">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001d.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001d.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001d)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001d-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001e-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001e-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001e)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001e)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,22 +82,22 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> - <subgrid style="grid:auto auto/masonry"> + <subgrid style="grid:auto auto/grid-lanes"> <item class="nth-1">4a</item> <item class="purple">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001e.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-001e.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001e)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001e)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001e-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002a-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002a-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002a)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: none / masonry"> + <subgrid style="grid: none"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002a.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002a.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002a)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002a-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002b-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002b-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002b)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,7 +63,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002b.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002b.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002b)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002b-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002c-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002c-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002c)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: 29px 19px / masonry"> + <subgrid style="grid: 29px 19px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002c.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002c.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002c)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002c-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002d-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002d-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002d)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid class="extent" style="grid: 39px 28px 19px / masonry"> + <subgrid class="extent" style="grid: 39px 28px 19px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002d.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002d.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002d)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002d-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002e-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002e-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002e)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002e)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: none / masonry"> + <subgrid style="grid: none"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002e.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002e.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002e)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002e)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002e-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002f-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002f-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002f)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002f)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,7 +63,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002f.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002f.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002f)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002f)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002f-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002g-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002g-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002g)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002g)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: 29px 19px / masonry"> + <subgrid style="grid: 29px 19px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002g.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002g.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002g)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002g)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002g-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002h-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002h-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002h)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002h)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid class="extent" style="grid: 39px 28px 19px / masonry"> + <subgrid class="extent" style="grid: 39px 28px 19px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002h.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002h.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002h)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002h)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002h-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002i-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002i-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002i)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002i)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: auto auto / masonry"> + <subgrid style="grid: auto auto"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002i.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/column/grid-lanes-subgrid-002i.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002i)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002i)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002i-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001a-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001a-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001a)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid class="rows"> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple">4b</item> <item style="grid-column:2">4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001a.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001a.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001a)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001a-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001b-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001b-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001b)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid class="rows"> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid style="grid:auto/subgrid"> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001b.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001b.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001b)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001b-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001c-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001c-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001c)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid class="rows"> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid style="grid:auto/subgrid; grid-auto-flow:column"> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001c.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001c.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001c)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001c-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001d-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001d-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-001d)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -22,15 +22,15 @@ grid { border-width: 3px 5px 1px 1px; background: lightgrey content-box; } -masonry-track { +grid-lanes-track { display: grid; gap: 4px 2px; } -masonry-track:nth-child(1) { +grid-lanes-track:nth-child(1) { grid-template-rows: 50px; grid-template-columns: min-content auto; } -masonry-track:nth-child(2) { +grid-lanes-track:nth-child(2) { grid-auto-flow: column; grid-template-rows: 80px 40px; grid-template-columns: auto; @@ -40,12 +40,12 @@ masonry-track:nth-child(2) { grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(1) { +.rows > grid-lanes-track:nth-child(1) { grid-template-columns: 50px; grid-template-rows: auto; align-content: start; } -.rows > masonry-track:nth-child(2) { +.rows > grid-lanes-track:nth-child(2) { grid-template-columns: 80px 40px; grid-template-rows: auto; align-content: start; @@ -69,10 +69,10 @@ subgrid { grid-gap: 8px 20px; background: yellow; } -masonry-track > subgrid { +grid-lanes-track > subgrid { grid-row: 1 / span 2; } -.rows > masonry-track > subgrid { +.rows > grid-lanes-track > subgrid { grid: auto auto / subgrid; grid-row: 2; grid-column: 1 / span 2; @@ -82,14 +82,14 @@ masonry-track > subgrid { </head> <body> -<!-- just to sanity check that `masonry` behaves as `none` in the column axis in this case: --> +<!-- just to sanity check that `grid-lanes` behaves as `none` in the column axis in this case: --> <grid class="rows"> - <masonry-track> + <grid-lanes-track> <item class="nth-1">1</item> <item>5</item> - </masonry-track> - <masonry-track> + </grid-lanes-track> + <grid-lanes-track> <item class="purple">2</item> <item>3</item> <subgrid style="grid:auto auto/subgrid"> @@ -97,7 +97,7 @@ masonry-track > subgrid { <item class="purple">4b</item> <item>4c</item> </subgrid> - </masonry-track> + </grid-lanes-track> </grid> </body></html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001d.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-001d.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-001d)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-001d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-001d-ref.html"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002a-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002a-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002a)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: masonry / none"> + <subgrid style="grid: none / none"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002a.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002a.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002a)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002a)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002a-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002b-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002b-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002b)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,7 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; + grid-template-columns: grid-lanes; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +25,7 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; + grid-template-rows: grid-lanes; grid-auto-flow: row; } item { @@ -65,7 +65,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002b.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002b.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002b)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002b)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002b-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002c-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002c-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002c)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: masonry / 27px 17px"> + <subgrid style="grid: none / 27px 17px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002c.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002c.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002c)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002c)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002c-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002d-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002d-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002d)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid class="extent" style="grid: masonry / 37px 24px 17px"> + <subgrid class="extent" style="grid: none / 37px 24px 17px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002d.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002d.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002d)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002d)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002d-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002e-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002e-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002e)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002e)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: masonry / none"> + <subgrid style="grid: none / none"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002e.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002e.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002e)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002e)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002e-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002f-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002f-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002f)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002f)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,7 +63,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002f.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002f.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002f)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002f)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002f-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002g-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002g-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002g)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002g)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: masonry / 27px 17px"> + <subgrid style="grid: none / 27px 17px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002g.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002g.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002g)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002g)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002g-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002h-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002h-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002h)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002h)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid class="extent" style="grid: masonry / 37px 24px 17px"> + <subgrid class="extent" style="grid: none / 37px 24px 17px"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002h.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002h.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002h)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002h)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002h-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002i-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002i-ref.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>Reference: Masonry layout with a subgrid (masonry-subgrid-002i)</title> + <title>Reference: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002i)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <style> html,body { @@ -15,7 +15,6 @@ html,body { grid { display: inline-grid; grid-template-rows: 40px 30px 20px; - grid-template-columns: masonry; gap: 4px 2px; padding: 1px 3px 5px 7px; border: solid; @@ -25,7 +24,6 @@ grid { } .rows { grid-template-columns: 40px 30px 20px; - grid-template-rows: masonry; grid-auto-flow: row; } item { @@ -65,13 +63,13 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> <item>2</item> <item>3</item> - <subgrid style="grid: masonry / auto auto"> + <subgrid style="grid: none / auto auto"> <item>4a</item> <item>4b</item> <item>4c</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002i.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/row/grid-lanes-subgrid-002i.html @@ -5,7 +5,7 @@ --> <html><head> <meta charset="utf-8"> - <title>CSS Grid Test: Masonry layout with a subgrid (masonry-subgrid-002i)</title> + <title>CSS Grid Test: Grid Lanes layout with a subgrid (grid-lanes-subgrid-002i)</title> <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-002i-ref.html"> @@ -64,7 +64,7 @@ subgrid.extent { </head> <body> -<!-- auto-placed subgrid inhibits subgridding when parent is doing masonry layout ... --> +<!-- auto-placed subgrid inhibits subgridding when parent is doing grid-lanes layout ... --> <grid class="rows"> <item>1</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-flex-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-flex-ref.html @@ -6,7 +6,7 @@ <html> <head> <meta charset="utf-8"> - <title>Verify correct sizing of flex tracks when using subgrid in CSS Masonry</title> + <title>Verify correct sizing of flex tracks when using subgrid in CSS Grid Lanes</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-flex.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-flex.html @@ -6,7 +6,7 @@ <html> <head> <meta charset="utf-8"> - <title>Verify correct sizing of flex tracks when using subgrid in CSS Masonry</title> + <title>Verify correct sizing of flex tracks when using subgrid in CSS Grid Lanes</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-flex-ref.html"> @@ -72,7 +72,7 @@ <item>5</item> </grid> -<!-- Verify behavior when subgrid is set to masonry too --> +<!-- Verify behavior when subgrid is set to grid-lanes too --> <grid> <item>1</item> <subgrid style="display: grid-lanes;"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-intrinsic-sizing-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-intrinsic-sizing-ref.html @@ -6,7 +6,7 @@ <html> <head> <meta charset="utf-8"> - <title>Verify correct sizing of intrinsically sized tracks when using subgrid in CSS Masonry</title> + <title>Verify correct sizing of intrinsically sized tracks when using subgrid in CSS Grid Lanes</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-intrinsic-sizing.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-intrinsic-sizing.html @@ -6,7 +6,7 @@ <html> <head> <meta charset="utf-8"> - <title>Verify correct sizing of intrinsically sized tracks when using subgrid in CSS Masonry</title> + <title>Verify correct sizing of intrinsically sized tracks when using subgrid in CSS Grid Lanes</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-intrinsic-sizing-ref.html"> @@ -72,7 +72,7 @@ <item>5</item> </grid> -<!-- Verify behavior when subgrid is set to masonry too --> +<!-- Verify behavior when subgrid is set to grid-lanes too --> <grid> <item>1</item> <subgrid style="display: grid-lanes;"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid-ref.html @@ -6,7 +6,7 @@ <html> <head> <meta charset="utf-8"> - <title>Verify basic CSS Masonry Subgrid support to ensure items are properly placed in the grid</title> + <title>Verify basic CSS Grid Lanes Subgrid support to ensure items are properly placed in the grid</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <style> @@ -72,10 +72,10 @@ <item>5</item> </grid> -<!-- Verify behavior when subgrid is set to masonry too --> +<!-- Verify behavior when subgrid is set to grid-lanes too --> <grid> <item>1</item> - <subgrid style="grid-template-rows: masonry"> + <subgrid> <item>2</item> <item style="width: 3ch">3</item> <item>4</item> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/subgrid/track-sizing/grid-lanes-subgrid.html @@ -6,7 +6,7 @@ <html> <head> <meta charset="utf-8"> - <title>Verify basic CSS Masonry Subgrid support to ensure items are properly placed in the grid</title> + <title>Verify basic CSS Grid Lanes Subgrid support to ensure items are properly placed in the grid</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3/#subgrids"> <link rel="match" href="grid-lanes-subgrid-ref.html"> @@ -72,7 +72,7 @@ <item>5</item> </grid> -<!-- Verify behavior when subgrid is set to masonry too --> +<!-- Verify behavior when subgrid is set to grid-lanes too --> <grid> <item>1</item> <subgrid style="display: grid-lanes;"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/column-auto-repeat-012.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/column-auto-repeat-012.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <title>Auto repeat tracks with min and max sizes</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<meta name="assert" content="This test checks that auto repeat tracks don't overflow the masonry container size when max size is definite, even if min size is bigger than that."> +<meta name="assert" content="This test checks that auto repeat tracks don't overflow the grid-lanes container size when max size is definite, even if min size is bigger than that."> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> .grid-lanes { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-010.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-010.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <title>Auto repeat tracks with min and max sizes</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<meta name="assert" content="This test checks that auto repeat tracks don't overflow the masonry container size when max size is definite, even if min size is bigger than that."> +<meta name="assert" content="This test checks that auto repeat tracks don't overflow the grid-lanes container size when max size is definite, even if min size is bigger than that."> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> .grid-lanes { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-no-items-crash.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/column-auto-repeat-auto-no-items-crash.html @@ -4,10 +4,10 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-template-columns: repeat(auto-fit, minmax(20px, 30px) auto); } </style> -<div id="masonry"></div> +<div id="grid-lanes"></div> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/repeat-auto-fit-auto-crash.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/repeat-auto-fit-auto-crash.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <head> <title> - repeat(auto-fit, auto) track size with no masonry items should not crash. + repeat(auto-fit, auto) track size with no grid-lanes items should not crash. </title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="help" href="https://issues.chromium.org/issues/432291718"> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-010.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-010.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <title>Auto repeat tracks with min and max sizes</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<meta name="assert" content="This test checks that auto repeat tracks don't overflow the masonry container size when max size is definite, even if min size is bigger than that."> +<meta name="assert" content="This test checks that auto repeat tracks don't overflow the grid-lanes container size when max size is definite, even if min size is bigger than that."> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> .grid-lanes { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-no-items-crash.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-no-items-crash.html @@ -4,11 +4,11 @@ <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> -#masonry { +#grid-lanes { display: grid-lanes; grid-lanes-direction: row; grid-template-rows: repeat(auto-fill, minmax(20px, 30px) auto); } </style> -<div id="masonry"></div> +<div id="grid-lanes"></div> </html> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-fit-content-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-fit-content-001-ref.html @@ -36,7 +36,7 @@ Number 6 </div> <!-- In Grid, the last column is 0 because no item is placed in it, so spanning - item 6 won't match masonry - which places all items in every track. Add another + item 6 won't match grid-lanes - which places all items in every track. Add another item since spanning row by 2 above doesn't work in grid --> <div style="background: brown; color: transparent;"> Number 7 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-max-content-001-ref.html @@ -36,7 +36,7 @@ Number 6 </div> <!-- In Grid, the last column is 0 because no item is placed in it, so spanning - item 6 won't match masonry - which places all items in every track. Add another + item 6 won't match grid-lanes - which places all items in every track. Add another item since spanning row by 2 above doesn't work in grid --> <div style="background: brown; color: transparent;"> Number 7 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-min-content-001-ref.html @@ -36,7 +36,7 @@ Number 6 </div> <!-- In Grid, the last column is 0 because no item is placed in it, so spanning - item 6 won't match masonry - which places all items in every track. Add another + item 6 won't match grid-lanes - which places all items in every track. Add another item since spanning row by 2 above doesn't work in grid --> <div style="background: brown; color: transparent;"> Number 7 diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-mixed-intrinsic-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-mixed-intrinsic-002-ref.html @@ -38,8 +38,8 @@ Number 6 </div> <!-- Fit content in grid requires an item to be placed in that track for it to be - non-zero. In masonry, this is not the case. Add an item to mimic the spanner - in the masonry test case. --> + non-zero. In grid-lanes, this is not the case. Add an item to mimic the spanner + in the grid-lanes test case. --> <div style="background: brown; color: transparent; grid-column: 1;"> Number 6 </div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/row-auto-repeat-011.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/auto-repeat/row-auto-repeat-011.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <title>Auto repeat tracks with min and max sizes</title> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> -<meta name="assert" content="This test checks that auto repeat tracks don't overflow the masonry container size when max size is definite, even if min size is bigger than that."> +<meta name="assert" content="This test checks that auto repeat tracks don't overflow the grid-lanes container size when max size is definite, even if min size is bigger than that."> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <style> .grid-lanes { diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-001-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized.</p> + <p>Test that grid-lanes tracks are correctly sized.</p> <div class="grid"> <div style="width: 100%; height: 50px; background: orange;"></div> <div style="width: 100%; height: 30px; background: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-001.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized.</p> + <p>Test that grid-lanes tracks are correctly sized.</p> <div class="grid-lanes"> <div style="width: 100%; height: 50px; background: orange;"></div> <div style="width: 100%; height: 30px; background: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-002-ref.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and auto tracks are stretched.</p> + <p>Test that grid-lanes tracks are correctly sized, and auto tracks are stretched.</p> <div class="grid"> <div style="grid-column: 1; background: green;">XXX XXX</div> <div style="grid-column: 1 / 3; background: purple;">X XX X</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-002.html @@ -14,7 +14,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and auto tracks are stretched.</p> + <p>Test that grid-lanes tracks are correctly sized, and auto tracks are stretched.</p> <div class="grid-lanes"> <div style="grid-column: 1; background: green;">XXX XXX</div> <div style="grid-column: 1 / 3; background: purple;">X XX X</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-003-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and flexible tracks are expanded.</p> + <p>Test that grid-lanes tracks are correctly sized, and flexible tracks are expanded.</p> <div class="grid"> <div style="background-color: orange;"></div> <div style="background-color: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-003.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and flexible tracks are expanded.</p> + <p>Test that grid-lanes tracks are correctly sized, and flexible tracks are expanded.</p> <div class="grid-lanes"> <div style="background-color: orange; height: 100px;"></div> <div style="background-color: yellow; height: 100px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-004-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mixed definite, fr and %.</p> + <p>Test that grid-lanes tracks are correctly sized with mixed definite, fr and %.</p> <div class="grid"> <div style="background-color: orange;"></div> <div style="background-color: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-004.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mixed definite, fr and %.</p> + <p>Test that grid-lanes tracks are correctly sized with mixed definite, fr and %.</p> <div class="grid-lanes"> <div style="background-color: orange; height: 100px;"></div> <div style="background-color: yellow; height: 100px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-005-ref.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mix of explicit and auto item placement.</p> + <p>Test that grid-lanes tracks are correctly sized with mix of explicit and auto item placement.</p> <div class="grid"> <div style="width: 50px; height: 50px; background: orange;"></div> <div style="width: 30px; height: 30px; background: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/column-track-sizing-005.html @@ -14,7 +14,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mix of explicit and auto item placement.</p> + <p>Test that grid-lanes tracks are correctly sized with mix of explicit and auto item placement.</p> <div class="grid-lanes"> <div style="width: 50px; height: 50px; background: orange;"></div> <div style="width: 30px; height: 30px; background: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/grid-lanes-track-sizing-check-grid-height-on-resize-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/grid-lanes-track-sizing-check-grid-height-on-resize-ref.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <html> -<title>CSS Reference: Masonry grid container size changes when item sizes change</title> +<title>CSS Reference: Grid Lanes grid container size changes when item sizes change</title> <head> <meta charset="utf-8"> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> @@ -9,7 +9,6 @@ <style> grid { display: inline-grid; - grid-template-rows: masonry; grid-template-columns: auto; grid-gap: 10px; border: 10px; diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/grid-lanes-track-sizing-check-grid-height-on-resize.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/grid-lanes-track-sizing-check-grid-height-on-resize.html @@ -3,11 +3,11 @@ <head> <meta charset="utf-8"> -<title>CSS Test: Masonry grid container size changes when item sizes change</title> +<title>CSS Test: Grid Lanes grid container size changes when item sizes change</title> <link rel="author" title="Brandon Stewart" href="mailto:brandonstewart@apple.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-3"> <link rel="match" href="grid-lanes-track-sizing-check-grid-height-on-resize-ref.html"> -<meta name="assert" content="Test passes if when the size of an item in the masonry grid changes, the grid container is properly resized"> +<meta name="assert" content="Test passes if when the size of an item in the grid-lanes grid changes, the grid container is properly resized"> </head> <style> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-001-ref.html @@ -11,7 +11,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized.</p> + <p>Test that grid-lanes tracks are correctly sized.</p> <div class="grid"> <div style="height: 100%; width: 50px; background: orange;"></div> <div style="height: 100%; width: 60px; background: pink; transform: translateX(-50px);"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-001.html @@ -14,7 +14,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized.</p> + <p>Test that grid-lanes tracks are correctly sized.</p> <div class="grid-lanes"> <div style="height: 100%; width: 50px; background: orange;"></div> <div style="height: 100%; width: 30px; background: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-002-ref.html @@ -14,7 +14,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and auto tracks are stretched.</p> + <p>Test that grid-lanes tracks are correctly sized, and auto tracks are stretched.</p> <div class="grid"> <div style="grid-row: 1; background: green; width: min-content;">XXX XXX</div> <div style="grid-row: 1 / 3; background: purple; width: 2em;">X XX X</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-002.html @@ -16,7 +16,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and auto tracks are stretched.</p> + <p>Test that grid-lanes tracks are correctly sized, and auto tracks are stretched.</p> <div class="grid-lanes"> <div style="grid-row: 1; background: green; width: min-content;">XXX XXX</div> <div style="grid-row: 1 / 3; background: purple; width: 2em;">X XX X</div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-003-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and flexible tracks are expanded.</p> + <p>Test that grid-lanes tracks are correctly sized, and flexible tracks are expanded.</p> <div class="grid"> <div style="background-color: orange;"></div> <div style="background-color: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-003.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized, and flexible tracks are expanded.</p> + <p>Test that grid-lanes tracks are correctly sized, and flexible tracks are expanded.</p> <div class="grid-lanes"> <div style="background-color: orange; width: 100px;"></div> <div style="background-color: yellow; width: 100px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-004-ref.html @@ -10,7 +10,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mixed definite, fr and %.</p> + <p>Test that grid-lanes tracks are correctly sized with mixed definite, fr and %.</p> <div class="grid"> <div style="background-color: orange;"></div> <div style="background-color: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-004.html @@ -13,7 +13,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mixed definite, fr and %.</p> + <p>Test that grid-lanes tracks are correctly sized with mixed definite, fr and %.</p> <div class="grid-lanes"> <div style="background-color: orange; width: 100px;"></div> <div style="background-color: yellow; width: 100px;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-005-ref.html @@ -12,7 +12,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mix of explicit and auto item placement.</p> + <p>Test that grid-lanes tracks are correctly sized with mix of explicit and auto item placement.</p> <div class="grid"> <div style="width: 50px; height: 50px; background: orange;"></div> <div style="width: 60px; height: 60px; background: pink;"></div> diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/track-sizing/row-track-sizing-005.html @@ -14,7 +14,7 @@ } </style> <body> - <p>Test that masonry tracks are correctly sized with mix of explicit and auto item placement.</p> + <p>Test that grid-lanes tracks are correctly sized with mix of explicit and auto item placement.</p> <div class="grid-lanes"> <div style="width: 50px; height: 50px; background: orange;"></div> <div style="width: 30px; height: 30px; background: yellow;"></div> diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed-implicit-track.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed-implicit-track.tentative.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing"> -<meta name="assert" content="Checks the resolved value of grid-template-columns on a masonry container with a leading implicit track."> +<meta name="assert" content="Checks the resolved value of grid-template-columns on a grid-lanes container with a leading implicit track."> <style> #target { display: grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed-nogrid.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed-nogrid.tentative.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing"> -<meta name="assert" content="Checks the resolved value of grid-template-columns on an element which is not a masonry container."> +<meta name="assert" content="Checks the resolved value of grid-template-columns on an element which is not a grid-lanes container."> <style> #target { display: block; diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed-withcontent.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed-withcontent.tentative.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns with intrinsic auto repeats</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns with intrinsic auto repeats</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-template-columns"> <meta name="assert" content="grid-template-columns computed value is the keyword none or a computed track list."> diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-columns-intrinsic-auto-repeat-computed.tentative.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing"> -<meta name="assert" content="Checks the resolved value of grid-template-columns on a masonry container."> +<meta name="assert" content="Checks the resolved value of grid-template-columns on a grid-lanes container."> <style> #target { display: grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed-implicit-track.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed-implicit-track.tentative.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing"> -<meta name="assert" content="Checks the resolved value of grid-template-rows on a masonry container with a leading implicit track."> +<meta name="assert" content="Checks the resolved value of grid-template-rows on a grid-lanes container with a leading implicit track."> <style> #target { display: grid-lanes; diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed-nogrid.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed-nogrid.tentative.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing"> -<meta name="assert" content="Checks the resolved value of grid-template-rows on an element which is not a masonry container."> +<meta name="assert" content="Checks the resolved value of grid-template-rows on an element which is not a grid-lanes container."> <style> #target { display: block; diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed-withcontent.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed-withcontent.tentative.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns with intrinsic auto repeats</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns with intrinsic auto repeats</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-template-rows"> <meta name="assert" content="grid-template-rows computed value is the keyword none or a computed track list."> diff --git a/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed.tentative.html b/testing/web-platform/tests/css/css-grid/parsing/grid-template-rows-intrinsic-auto-repeat-computed.tentative.html @@ -1,9 +1,9 @@ <!DOCTYPE html> <meta charset="utf-8"> -<title>CSS Masonry Layout Test: getComputedStyle().gridTemplateColumns</title> +<title>CSS Grid Lanes Layout Test: getComputedStyle().gridTemplateColumns</title> <link rel="author" title="Alison Maher" href="mailto:almaher@microsoft.com"> <link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing"> -<meta name="assert" content="Checks the resolved value of grid-template-rows on a masonry container."> +<meta name="assert" content="Checks the resolved value of grid-template-rows on a grid-lanes container."> <style> #target { display: grid-lanes;