From 70e115555a6aa590d10664699146aa26eed59f1e Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Mon, 2 Jun 2014 15:15:13 -0700 Subject: [PATCH] Bug 1015482 part 2: Adjust sizes in some flexbox reftests so that min-width:auto won't affect their rendering. r=mats --- .../flexbox/pagination/flexbox-unbreakable-child-1-ref.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1a.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1b.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1c.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-1d.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-2-ref.html | 2 +- .../flexbox/pagination/flexbox-unbreakable-child-2.html | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html index e1f4fe498119..d0231e2f5f7e 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1-ref.html @@ -7,7 +7,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html index c2726f44ed9c..4b917aa18f50 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a-wrap.html @@ -11,7 +11,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html index 5b36072b7dba..8164a5aa3399 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1a.html @@ -10,7 +10,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html index df1837d937e5..3d2ae7e134c4 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b-wrap.html @@ -11,7 +11,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html index 91a9fa788b00..0b0aef65392b 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1b.html @@ -10,7 +10,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html index bd621dc0c85d..ae31d08981c4 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c-wrap.html @@ -11,7 +11,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html index 26123a5bfbf3..bfd2fde16206 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1c.html @@ -10,7 +10,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html index 95a9a0f82802..1e3e9ff8c424 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d-wrap.html @@ -11,7 +11,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html index ff8f86b6d5da..317e625d04ec 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-1d.html @@ -10,7 +10,7 @@ .multicol { height: 10px; width: 100px; - -moz-column-width: 20px; + -moz-column-width: 30px; -moz-column-fill: auto; border: 2px solid orange; margin-bottom: 15px; /* (just for spacing between testcases) */ diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html index d6cee758705d..163234dea0ea 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2-ref.html @@ -24,7 +24,7 @@ height: 15px; border: 1px dotted teal; margin: 1px; - font: 10px; + font: 10px serif; float: left; } diff --git a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html index 8f7f984338c1..b006e9718a11 100644 --- a/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html +++ b/layout/reftests/flexbox/pagination/flexbox-unbreakable-child-2.html @@ -28,7 +28,7 @@ height: 15px; border: 1px dotted teal; margin: 1px; - font: 10px; + font: 10px serif; }