diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-07 18:41:24 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-07 18:41:24 +0530 |
| commit | a333f0fdd0c15a893e43a09e5ba43c173f847ae2 (patch) | |
| tree | 5768ceecc8a1861fb74343773d1fb6c50db45f67 /tests/wpt/css-tests/css-flexbox-1_dev/html/reference | |
| parent | 5cf89fea48fb1fc58fd665384cbaa2060decff31 (diff) | |
| parent | 7deaeea707fdc42e2c3b1ebe9c5116b47529de80 (diff) | |
| download | servo-a333f0fdd0c15a893e43a09e5ba43c173f847ae2.tar.gz servo-a333f0fdd0c15a893e43a09e5ba43c173f847ae2.zip | |
Auto merge of #10455 - servo:css-20160407, r=Ms2ger
Update CSS tests to revision aac1cd51245c0c469325988a0446985a2f1e476c
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10455)
<!-- Reviewable:end -->
Diffstat (limited to 'tests/wpt/css-tests/css-flexbox-1_dev/html/reference')
3 files changed, 14 insertions, 18 deletions
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm index adbc1426a62..4c62e2adeb0 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/css-flexbox-column-ref.htm @@ -25,7 +25,7 @@ <div class="item">４５６</div> <div class="item">ｄｅｆ</div> <div class="item">７８９</div> - <div class="item">ｇｈｉ</div> + <div class="item">ｓｔｕ</div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm index e9ba478711b..e6f34209cd0 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-table-fixup-001-ref.htm @@ -2,22 +2,17 @@ <!-- Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ ---><!-- Reference case for table-fixup on table parts inside of a - flex container. --><html> +--><!-- Reference case for ensuring table-fixup does not happen to adjacent + table parts directly inside of a flex container. --><html> <head> <title>CSS Reftest Reference</title> <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"> <style> div.flexbox { border: 1px dashed blue; - } - - <!-- NOTE: table-fixup pads each td element by 1px on each side. We - override that for top & bottom, for simplicity. So the td makes us - generate a box that's 2px wider than its contents. --> - td { - padding-top: 0px; - padding-bottom: 0px; + width: 200px; + display: flex; + justify-content: space-around; } .a { @@ -37,14 +32,11 @@ </style> </head> <body> - <!-- Just 2 adjacent table cells (they end up in the same table) --> - <div class="flexbox" style="padding-left: 50px; width: 150px"><td class="a">cell1</td><td class="b">cell2</td></div> + <!-- In each example here, we simply use blocks instead of table parts --> + <div class="flexbox"><div class="a">cell1</div><div class="b">cell2</div></div> - <!-- Table cell followed by tbody (they end up in the same table) --> - <div class="flexbox" style="padding-left: 75px; width: 125px"><td class="a">cell1</td><tbody class="b">t</tbody></div> + <div class="flexbox"><div class="a">cell1</div><div class="b">t</div></div> - <!-- Empty table cell (ends up occupying 2px of width), followed by div, - followed by nonempty table cell. (3 flex items). --> - <div class="flexbox" style="padding-left: 52px; width: 148px"><div style="display: inline-block;" class="c">div</div><div style="display: inline-table; margin-left: 50px"><td class="b">cell1</td></div></div> + <div class="flexbox"><div></div><div class="b">cell1</div></div> </body> </html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm index 3e7bbaa5f99..2eb3494e69f 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm +++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-with-pseudo-elements-003-ref.htm @@ -23,10 +23,14 @@ .fakeBefore { content: 'b'; background: yellow; + align-self: center; + order: 1; } .fakeAfter { content: 'a'; background: lightblue; + align-self: center; + order: -1; } </style> </head> |