diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-08-21 17:46:44 +0200 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-08-21 18:40:37 +0200 |
| commit | f235d49372ba86d6d01530fe1b9ebdf8bea74468 (patch) | |
| tree | 13d3535ee53fcae1b8d61265e3d97adb00dd60eb /tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference | |
| parent | 7c45ff8e05a6ebd21f9aa5c360e997a01d48b1fc (diff) | |
| download | servo-f235d49372ba86d6d01530fe1b9ebdf8bea74468.tar.gz servo-f235d49372ba86d6d01530fe1b9ebdf8bea74468.zip | |
Update CSS tests to revision d674587d6ae7d2e231d632785559f2613d554eb0
Diffstat (limited to 'tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference')
4 files changed, 72 insertions, 2 deletions
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht index 4f4b322478b..3ac0639340b 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht @@ -9,7 +9,6 @@ width: 9em; } .item { - -webkit-writing-mode: vertical-rl; writing-mode: vertical-rl; background: green; height: 4em; diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-container-margin-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-container-margin-ref.xht new file mode 100644 index 00000000000..38187fe38ca --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-container-margin-ref.xht @@ -0,0 +1,33 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><head> +<title>CSS Test: flex-container-margin-not-collapse-with-content-margin</title> +<link href="http://www.github.com/sskyy" rel="author" title="houzhenyu" /> +<style> + .flex-container{ + display:block; + margin:20px; + background: #333; + line-height: 0px; + } + .flex-item{ + display: inline-block; + width:50px; + height:50px; + margin:20px 20px; + background: #eee; + } + .flex-item.first{ + margin-left:20px; + } + .flex-item.last{ + margin-right: 20px; + } +</style> +</head> +<body> + <div class="flex-container"> + <div class="flex-item first"></div><div class="flex-item"></div><div class="flex-item last"></div> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-order-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-order-ref.xht index 1ba69136aa2..527604fc061 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-order-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flex-order-ref.xht @@ -3,7 +3,7 @@ <title>CSS Reftest Reference: flex order</title> <link href="mailto:mitsuteru.s@gmail.com" rel="author" title="Mitsuteru Sawa" /> <style> - #container { display: -webkit-flex; } + #container { display: flex; } #highOrdinal { background: lime; height: 100px; width: 100px; diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/grid-2x2-blue-yellow-lime-magenta.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/grid-2x2-blue-yellow-lime-magenta.xht new file mode 100644 index 00000000000..8e83cab6f9f --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/grid-2x2-blue-yellow-lime-magenta.xht @@ -0,0 +1,38 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>CSS Grid Layout Test: Reference file 2x2 grid and cells with the following colors: blue, yellow, lime and magenta</title> + <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> + <style type="text/css"><![CDATA[ + div { + font: 50px/1 Ahem; + } + + #blue { + color: blue; + } + + #yellow { + color: yellow; + } + + #lime { + color: lime; + } + + #magenta { + color: magenta; + } + ]]></style> + </head> + <body> + <p>Test passes if there are four filled squares with the same size and <strong>no red</strong>.</p> + <p>Blue and yellow squares in the first line; lime and magenta squares in the second line (exactly in this order).</p> + + <div> + <span id="blue">B</span><span id="yellow">Y</span> + <br /> + <span id="lime">L</span><span id="magenta">M</span> + </div> + </body> +</html>
\ No newline at end of file |