From 24b11942e9e97cd48dda83646d4f7ec702b23eba Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Fri, 20 Jul 2018 09:01:58 +0200 Subject: Bug 1434380: Rewrite parts of reftest reference case grid-auto-min-sizing-definite-001-ref.html to be easier to understand & adjust --- .../grid-auto-min-sizing-definite-001-ref.html | 47 +++++++++------------- 1 file changed, 19 insertions(+), 28 deletions(-) (limited to 'layout/reftests/css-grid') diff --git a/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html b/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html index a0d9180a2..0068e3220 100644 --- a/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html +++ b/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html @@ -62,40 +62,31 @@ b40 { z-index: 1; position:relative; } -w { - position:absolute; - background: lime; - border-width: 1px 0 0 3px; - border-style: solid; - height:48px; - width:75px; -} -.v > w { - border-width: 3px 0 0 1px; - left:-1px; top:-3px; - height:53px; - width:61px; -} -.h.r { margin-left:19px; padding: 1px 15px 37px 30px; } -.v .h > w { - height:48px; - width:45px; -} -.v.r > w { - height:53px; - width:61px; +.h.r { + height: 42px; + width: 42px; + /* This margin-left is 20% of 98px-wide grid area */ + margin-left: 19.6px; + /* This padding-bottom is 10% of 47.5px tall grid area */ + /* This padding-left is 30% of 98px wide grid area */ + padding: 1px 3px 4.75px 29.4px; } -.v .v > w { - height:41px; - width:45px; +.v.r { + height: 42px; + width: 42px; + /* This margin-left is 20% of 54px-wide grid area */ + margin-left: 10.8px; + /* This padding-bottom is 10% of 102.5px tall grid area */ + /* This padding-left is 30% of 54px wide grid area */ + padding: 1px 3px 10.25px 16.2px; } .r { position:relative; } .t6 { width:46px; } -.t8 { width:118px; } +.t8 { width:118px; height: 102.5px; } -xx { +xx { display: block; background: lime; padding:32px 32px 16px 32px; @@ -114,7 +105,7 @@ xx {
-
+
-- cgit v1.2.3 From b12973bc9aa26f548549306eaec4146bf60d65d5 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Fri, 20 Jul 2018 09:09:36 +0200 Subject: Bug 958714 Remove special case for flex & grid items' percent block-axis margin/padding resolution, to align with other browsers --- .../reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html | 8 ++++---- layout/reftests/css-grid/grid-item-sizing-percent-001-ref.html | 4 ++-- layout/reftests/css-grid/grid-item-sizing-percent-001.html | 4 ++-- layout/reftests/css-grid/grid-item-sizing-px-001.html | 4 ++-- layout/reftests/css-grid/reftest.list | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'layout/reftests/css-grid') diff --git a/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html b/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html index 0068e3220..8858b4ea8 100644 --- a/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html +++ b/layout/reftests/css-grid/grid-auto-min-sizing-definite-001-ref.html @@ -67,18 +67,18 @@ b40 { width: 42px; /* This margin-left is 20% of 98px-wide grid area */ margin-left: 19.6px; - /* This padding-bottom is 10% of 47.5px tall grid area */ + /* This padding-bottom is 10% of 98px wide grid area */ /* This padding-left is 30% of 98px wide grid area */ - padding: 1px 3px 4.75px 29.4px; + padding: 1px 3px 9.8px 29.4px; } .v.r { height: 42px; width: 42px; /* This margin-left is 20% of 54px-wide grid area */ margin-left: 10.8px; - /* This padding-bottom is 10% of 102.5px tall grid area */ + /* This padding-bottom is 10% of 54px wide grid area */ /* This padding-left is 30% of 54px wide grid area */ - padding: 1px 3px 10.25px 16.2px; + padding: 1px 3px 5.4px 16.2px; } .r { position:relative; } diff --git a/layout/reftests/css-grid/grid-item-sizing-percent-001-ref.html b/layout/reftests/css-grid/grid-item-sizing-percent-001-ref.html index 3a7f2d6bb..4996f8b9c 100644 --- a/layout/reftests/css-grid/grid-item-sizing-percent-001-ref.html +++ b/layout/reftests/css-grid/grid-item-sizing-percent-001-ref.html @@ -30,8 +30,8 @@ body,html { color:black; background:white; font-size:16px; padding:0; margin:0; } .p { padding:2px 3px; } .m { margin:2px 3px; } -.c1.p,.c2.p { padding:5px 9px; } -.c1.m,.c2.m { margin:5px 9px; } +.c1.p,.c2.p { padding:6px 9px; } +.c1.m,.c2.m { margin:6px 9px; } .b { border:solid black; } #t1 { width:50px; height: 20px; } diff --git a/layout/reftests/css-grid/grid-item-sizing-percent-001.html b/layout/reftests/css-grid/grid-item-sizing-percent-001.html index cc5948968..960247592 100644 --- a/layout/reftests/css-grid/grid-item-sizing-percent-001.html +++ b/layout/reftests/css-grid/grid-item-sizing-percent-001.html @@ -48,8 +48,8 @@ body,html { color:black; background:white; font-size:16px; padding:0; margin:0; box-sizing: border-box; } -.p { padding:10% 6%; } -.m { margin:10% 6%; } +.p { padding:4% 6%; } +.m { margin:4% 6%; } .b { border:solid black; } diff --git a/layout/reftests/css-grid/grid-item-sizing-px-001.html b/layout/reftests/css-grid/grid-item-sizing-px-001.html index a004365fc..7e58d831d 100644 --- a/layout/reftests/css-grid/grid-item-sizing-px-001.html +++ b/layout/reftests/css-grid/grid-item-sizing-px-001.html @@ -46,8 +46,8 @@ body,html { color:black; background:white; font-size:16px; padding:0; margin:0; .p { padding:2px 3px; } .m { margin:2px 3px; } -.c1.p,.c2.p { padding:5px 9px; } -.c1.m,.c2.m { margin:5px 9px; } +.c1.p,.c2.p { padding:6px 9px; } +.c1.m,.c2.m { margin:6px 9px; } .b { border:solid black; } diff --git a/layout/reftests/css-grid/reftest.list b/layout/reftests/css-grid/reftest.list index 093e2faee..c2ee57c1a 100644 --- a/layout/reftests/css-grid/reftest.list +++ b/layout/reftests/css-grid/reftest.list @@ -45,7 +45,7 @@ skip-if(Android) fuzzy-if(winWidget,1,32) == grid-placement-auto-implicit-001.ht == vrl-grid-placement-auto-row-sparse-001.html vrl-grid-placement-auto-row-sparse-001-ref.html == grid-relpos-items-001.html grid-relpos-items-001-ref.html == grid-item-sizing-percent-001.html grid-item-sizing-percent-001-ref.html -== grid-item-sizing-percent-002.html grid-item-sizing-percent-002-ref.html +fails == grid-item-sizing-percent-002.html grid-item-sizing-percent-002-ref.html # bug 1434397 == grid-item-sizing-percent-003.html grid-item-sizing-percent-003-ref.html == grid-item-sizing-percent-004.html grid-item-sizing-percent-004-ref.html == grid-item-sizing-px-001.html grid-item-sizing-percent-001-ref.html -- cgit v1.2.3