From e6c84d38b07e736963e4b7902c81be1089219e41 Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Mon, 28 Nov 2016 00:44:22 +0100 Subject: [PATCH] Bug 1319958 - [css-grid] Sprinkle some place-items/self/content shorthands around in the Grid reftests to increase test coverage. --- ...rid-auto-min-sizing-transferred-size-003-ref.html | 3 +-- .../grid-item-intrinsic-ratio-stretch-002-ref.html | 3 +-- .../css-grid/grid-item-mixed-baseline-002-ref.html | 4 ++-- .../css-grid/grid-item-mixed-baseline-002.html | 12 +++++------- .../css-grid/grid-item-self-baseline-001.html | 3 +-- .../reftests/css-grid/grid-percent-grid-gap-001.html | 4 ++-- .../css-grid/grid-percent-intrinsic-sizing-001.html | 3 +-- .../grid-placement-implicit-named-areas-001-ref.html | 6 ++---- 8 files changed, 15 insertions(+), 23 deletions(-) diff --git a/layout/reftests/css-grid/grid-auto-min-sizing-transferred-size-003-ref.html b/layout/reftests/css-grid/grid-auto-min-sizing-transferred-size-003-ref.html index cabcc0aaeebd..1495c3a6f27d 100644 --- a/layout/reftests/css-grid/grid-auto-min-sizing-transferred-size-003-ref.html +++ b/layout/reftests/css-grid/grid-auto-min-sizing-transferred-size-003-ref.html @@ -14,8 +14,7 @@ html,body { color:black; background-color:white; font:12px monospace; padding:0; display: grid; float: left; border: 1px solid; - align-items: start; - justify-items: start; + place-items: start; margin-bottom:1em; } diff --git a/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-002-ref.html b/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-002-ref.html index d3d060e02473..c10ded9496bf 100644 --- a/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-002-ref.html +++ b/layout/reftests/css-grid/grid-item-intrinsic-ratio-stretch-002-ref.html @@ -14,8 +14,7 @@ body,html { color:black; background:white; font:16px/1 monospace; padding:0; mar display: inline-grid; border: 1px solid; margin: 5px; - align-items: start; - justify-items: start; + place-items: start start; } .vertical-tests div { vertical-align:bottom } diff --git a/layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html b/layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html index af932be6132b..b18d33a28d33 100644 --- a/layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html +++ b/layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html @@ -43,8 +43,8 @@ span:nth-child(4) { font-size:24px; } .pbs { padding-block-start: 15px; margin-block-start: 5px; } .pbe { padding-block-end: 7px; margin-block-end: 3px; } -.fb { align-self:baseline; justify-self:self-start; } -.lb { align-self:last baseline; justify-self:self-end; } +.fb { place-self:first baseline self-start; } +.lb { place-self:last baseline self-end; } .s { justify-self:stretch; } .sfb { align-self:baseline; } diff --git a/layout/reftests/css-grid/grid-item-mixed-baseline-002.html b/layout/reftests/css-grid/grid-item-mixed-baseline-002.html index 2e9986b5469a..f28452400c76 100644 --- a/layout/reftests/css-grid/grid-item-mixed-baseline-002.html +++ b/layout/reftests/css-grid/grid-item-mixed-baseline-002.html @@ -21,13 +21,11 @@ html,body { grid: 100px / repeat(10, auto); border: 2px solid; margin: 1px; - align-content: start; - justify-content: end; + place-content: start end; } .c { grid: repeat(4, auto) / 100px; - align-content: end; - justify-content: start; + place-content: end start; } .t2 { grid: 100px / repeat(3, auto);} @@ -45,9 +43,9 @@ span:nth-child(4) { font-size:24px; } .pbs { padding-block-start: 15px; margin-block-start: 5px; } .pbe { padding-block-end: 7px; margin-block-end: 3px; } -.fb { align-content:baseline; align-self:self-start; justify-self:self-start; } -.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; } -.s { align-self:stretch; justify-self:stretch; } +.fb { align-content:baseline; place-self:self-start; } +.lb { align-content:last baseline; place-self:self-end; } +.s { place-self:stretch; } .sfb { align-self:baseline; } .slb { align-self:last baseline; align-content:self-end;} diff --git a/layout/reftests/css-grid/grid-item-self-baseline-001.html b/layout/reftests/css-grid/grid-item-self-baseline-001.html index b715b084b5c6..1d3e5959388c 100644 --- a/layout/reftests/css-grid/grid-item-self-baseline-001.html +++ b/layout/reftests/css-grid/grid-item-self-baseline-001.html @@ -18,8 +18,7 @@ html,body { float: left; display: grid; grid: auto / repeat(4, auto); - align-items: start; - justify-items: start; + place-items: start; border: 2px solid; padding: 1px; margin: 1px; diff --git a/layout/reftests/css-grid/grid-percent-grid-gap-001.html b/layout/reftests/css-grid/grid-percent-grid-gap-001.html index 4d33a01e00c6..57c0b3c08699 100644 --- a/layout/reftests/css-grid/grid-percent-grid-gap-001.html +++ b/layout/reftests/css-grid/grid-percent-grid-gap-001.html @@ -63,7 +63,7 @@ br { clear: both; }
-
+
@@ -81,7 +81,7 @@ br { clear: both; }
-
+
diff --git a/layout/reftests/css-grid/grid-percent-intrinsic-sizing-001.html b/layout/reftests/css-grid/grid-percent-intrinsic-sizing-001.html index 7f8ae54c263b..226e2facf68d 100644 --- a/layout/reftests/css-grid/grid-percent-intrinsic-sizing-001.html +++ b/layout/reftests/css-grid/grid-percent-intrinsic-sizing-001.html @@ -22,8 +22,7 @@ div { height: 5px; border: 1px solid; clear: left; - align-content: start; - justify-content: start; + place-content: start start; } span { diff --git a/layout/reftests/css-grid/grid-placement-implicit-named-areas-001-ref.html b/layout/reftests/css-grid/grid-placement-implicit-named-areas-001-ref.html index a1c63b396526..01e936d3aed0 100644 --- a/layout/reftests/css-grid/grid-placement-implicit-named-areas-001-ref.html +++ b/layout/reftests/css-grid/grid-placement-implicit-named-areas-001-ref.html @@ -16,10 +16,8 @@ div { float: left; width: 100px; margin: 2px; - align-items: stretch; - justify-items: stretch; - align-content: start; - justify-content: start; + place-items: stretch; + place-content: start; } .row-tests div { height: 100px;