diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-10-06 12:33:05 +0200 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-10-06 17:04:25 +0200 |
| commit | 145aea3eeb48dcd48b5fe475d011b704dc46030c (patch) | |
| tree | f333a4cda84b9a4d285d5c2e3a7eb77889e2aad1 /tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference | |
| parent | ad94ef5a96e954f1a660cdd3a2ff03e0787f690b (diff) | |
| download | servo-145aea3eeb48dcd48b5fe475d011b704dc46030c.tar.gz servo-145aea3eeb48dcd48b5fe475d011b704dc46030c.zip | |
Update CSS tests to revision 7a87ef71fc579e52d3438e009107aa442bc4021b
Diffstat (limited to 'tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference')
17 files changed, 100 insertions, 122 deletions
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-box-justify-content-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-box-justify-content-ref.xht index d651d786256..7848d9623c0 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-box-justify-content-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-box-justify-content-ref.xht @@ -1,5 +1,5 @@ <!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>flexbox |css-box-justufy-content</title> +<html xmlns="http://www.w3.org/1999/xhtml"><head><title>flexbox |css-box-justify-content</title> <link href="ava656094@gmail.com" rel="author" title="xiaoxia" /> <style> #flexbox { @@ -11,7 +11,7 @@ } .item{ display: inline-block; - align:right; + text-align:left; width:50px; height: 30px; } @@ -24,4 +24,5 @@ <div style="background-color: rgb(215, 172, 243); color: rgb(74, 123, 110);" class="item">DIV3</div> <div style="background-color: rgb(242, 133, 80); color: rgb(41, 119, 248);" class="item">DIV4</div> <div style="background-color: rgb(242, 50, 80); color: rgb(41, 119, 248);" class="item">DIV5</div> -</div></body></html>
\ No newline at end of file +</div> +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-img-expand-evenly-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-img-expand-evenly-ref.xht index 25b1de545d1..8540a4079be 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-img-expand-evenly-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-img-expand-evenly-ref.xht @@ -20,13 +20,14 @@ </style> </head> <body> - <p>3 square images fill out border.</p> + <p>3 rectangular images fill out border.</p> <!-- PAGE CONTENT --> <div class="flexbox"> - <img src="support/solidblue.png" /> - <img src="support/solidblue.png" /> - <img src="support/solidblue.png" /> + <!-- It is important that there is no linebreak between the <img> tags. + The line break would be rendered as whitespace, breaking the test. + --> + <img src="../support/solidblue.png" /><img src="../support/solidblue.png" /><img src="../support/solidblue.png" /> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-row-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-row-ref.xht index 0357fe55d14..c7989de8419 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-row-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/css-flexbox-row-ref.xht @@ -12,6 +12,7 @@ background: green; height: 3em; width: 3em; + line-height: 1.5em; } </style> </head> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-align-items-center-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-align-items-center-ref.xht index 0aaa6858ec8..d77749cbe0a 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-align-items-center-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-align-items-center-ref.xht @@ -17,8 +17,8 @@ left: 10px; } #a { - top: 150px; - left: 230px; + top: 148px; + left: 239px; border: 2px dotted blue; background: green; border-radius: 3px; @@ -29,8 +29,8 @@ flex: none; } #b { - top: 150px; - left: 283px; + top: 148px; + left: 293px; border: 2px dotted blue; background: green; border-radius: 3px; @@ -41,8 +41,8 @@ flex: none; } #c { - top: 150px; - left: 336px; + top: 148px; + left: 347px; border: 2px dotted blue; background: green; border-radius: 3px; @@ -63,4 +63,5 @@ <div style="position:absolute" id="b"></div> <div style="position:absolute" id="c"></div> + </body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-flexitem-percentage-prescation-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-flexitem-percentage-prescation-ref.xht index 16863b64369..07986cef58d 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-flexitem-percentage-prescation-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-flexitem-percentage-prescation-ref.xht @@ -22,8 +22,8 @@ <body> <div id="test"> <div id="test"> - <p style="background:green;top:0px;height:300px;left:0px;height:300px;width:50px;">damer</p> - <p style="top:0px;left:50px;height:300px;background:Red;width:51px;">damer</p> + <p style="background:green;top:0px;height:300px;left:0px;height:300px;width:50.5px;">damer</p> + <p style="top:0px;left:50.5px;height:300px;background:Red;width:50.5px;">damer</p> </div> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-items-flexibility.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-items-flexibility.xht index 15602acb5e0..c77e60cdd7d 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-items-flexibility.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flex-items-flexibility.xht @@ -4,9 +4,6 @@ <link href="mailto:zhangcs_423@163.com" rel="author" title="Chunsheng Zhang" /> <style type="text/css"> #container { - display: flex; - justify-content: center; - align-items: center; border: 5px solid green; width: 600px; height: 200px; @@ -16,22 +13,16 @@ top: 70px; left: 10px; } - div { - padding: 10px; - width: 30px; - height: 40px; - text-align: center; - flex: 1 0 auto; - } #flex { border: 2px dotted blue; background: green; border-radius: 3px; - flex: 2 0 auto; position: absolute; - top: 70px; - left: 160px; - width: 254px; + top: 73px; + left: 166.5px; + width: 253px; + height: 40px; + padding: 10px; } </style> </head> @@ -39,9 +30,8 @@ <p>This case tests that flex items flexibility</p> <p>The test passes if there is no red</p> <section id="container"> - <div></div> <div id="flex"></div> - <div></div> </section> + </body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_direction-row-reverse-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_direction-row-reverse-ref.xht index ac7edaaf2a8..b167a0176e3 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_direction-row-reverse-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_direction-row-reverse-ref.xht @@ -14,14 +14,13 @@ ul { } li { color: white; - margin: 0 3px 0 0; + margin: 0; + width: 3.3333em; display: inline-block; } </style> </head><body><ul> - <li>EFGH</li> - <li>ABCD</li> - <li>IJKL</li> + <li>EFGH</li><li>ABCD</li><li>IJKL</li> </ul> </body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_generated-container-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_generated-container-ref.xht deleted file mode 100644 index da2853a4c47..00000000000 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_generated-container-ref.xht +++ /dev/null @@ -1,12 +0,0 @@ -<!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>flexbox | flexcontainer vs generated content</title> -<link href="http://opera.com" rel="author" title="Opera Software" /> -<style> -div { - content: "xxx"; - background: blue; -} -</style> - -</head><body><div></div> -</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_min-height-auto-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_min-height-auto-ref.xht deleted file mode 100644 index 28e2e97a6cd..00000000000 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_min-height-auto-ref.xht +++ /dev/null @@ -1,30 +0,0 @@ -<!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>flexbox | min-height: auto</title> -<link href="http://opera.com" rel="author" title="Opera Software" /> -<style> -body { - margin: 0; - width: 602px; -} -div { - background: #3366cc; - border: 1px solid black; -} -p { - background: yellow; - margin: 1em 1em 2em; - height: auto; - min-height: auto; -} -p:last-child { - margin-bottom: 1em; -} -</style> - -</head><body><div> - <p>damer</p> - <p>damer</p> - <p>damer</p> - <p>damer</p> -</div> -</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_min-width-auto-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_min-width-auto-ref.xht deleted file mode 100644 index 2c2a0fb4752..00000000000 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox_min-width-auto-ref.xht +++ /dev/null @@ -1,33 +0,0 @@ -<!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>flexbox | min-width: auto</title> -<link href="http://opera.com" rel="author" title="Opera Software" /> -<style> -body { - margin: 0; - width: 602px; -} -div { - background: #3366cc; - border: 1px solid black; -} -div::after { - content: ""; - clear: both; - display: block; -} -p { - background: yellow; - margin: 1em; - min-width: auto; - width: auto; - float: left; -} -</style> - -</head><body><div> - <p>damer</p> - <p>damer</p> - <p>damer</p> - <p>damer</p> -</div> -</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-reverse-column-reverse-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-reverse-column-reverse-ref.xht index 715b7714446..963f160ee31 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-reverse-column-reverse-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-reverse-column-reverse-ref.xht @@ -9,7 +9,7 @@ .test { width: 300px; float: left; - width: 33.3%; + width: 33.3333%; } p { diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-with-column-reverse-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-with-column-reverse-ref.xht index e2d1c6d9d02..c61bb385d10 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-with-column-reverse-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/multi-line-wrap-with-column-reverse-ref.xht @@ -9,7 +9,7 @@ .test { width: 300px; float: left; - width: 33.3%; + width: 33.3333%; } p { diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/order-with-column-reverse-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/order-with-column-reverse-ref.xht index 91793cbe24b..5b905da9783 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/order-with-column-reverse-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/order-with-column-reverse-ref.xht @@ -4,6 +4,9 @@ <link href="mailto:tmtysk@gmail.com" rel="author" title="tmtysk" /> <link href="mailto:jackalmage@gmail.com" rel="reviewer" title="Tab Atkins" /> <style> + p { + margin: 0; + } </style> </head> <body> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-align-content-space-around-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-align-content-space-around-ref.xht new file mode 100644 index 00000000000..8bebaac48fd --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-align-content-space-around-ref.xht @@ -0,0 +1,36 @@ +<!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 Flexible Box Test: align-content property - space-between</title> + <link href="mailto:haosdent@gmail.com" rel="author" title="haosdent" /> + <style type="text/css"> + .container { + position: relative; + height: 14em; + width: 20em; + background: red; + margin: 1em; + border: 1px solid black; + } + + span { + height: 2em; + display: inline-block; + background: green; + color: white; + margin: 2.5em 1em; + width: 8em; + float: left; + } + </style> +</head> +<body> + <p>The test passed if you see a 2*2 table and all the cells are at the bottom of container.</p> + <div class="container"> + <span>first</span> + <span>second</span> + <span>third</span> + <span>forth</span> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-direction-row-reverse-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-direction-row-reverse-ref.xht index 88a3a6222ce..f0ce6958cfb 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-direction-row-reverse-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-direction-row-reverse-ref.xht @@ -5,10 +5,10 @@ <style type="text/css"> .container { position: relative; - display: flex; background: red; margin: 1em 0; border: 1px solid black; + text-align: right; } span { display: inline-block; @@ -16,16 +16,14 @@ color: white; margin: 1em; width: 8em; + text-align: left; } </style> </head> <body> - <p>The test passed if you see all the cells are arraged horizontally and the order of cells are reversed.</p> + <p>The test passed if you see all the cells are arranged horizontally and the order of cells are reversed.</p> <div class="container"> - <span>forth</span> - <span>third</span> - <span>second</span> - <span>first</span> + <span>forth</span><span>third</span><span>second</span><span>first</span> </div> diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-inline-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-inline-ref.xht new file mode 100644 index 00000000000..525cc83c950 --- /dev/null +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-inline-ref.xht @@ -0,0 +1,26 @@ +<!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 Flexible Box Test: display proprety - inline-flex</title> + <link href="mailto:haosdent@gmail.com" rel="author" title="haosdent" /> + <style type="text/css"> + /* Positioned container allows for the self-describing statement to still + be visible in the case of failure */ + .container { + position: relative; + } + .greenSquare { + display: inline-block; + margin-top: -200px; + background: green; + } + </style> +</head> +<body> + <p>The test passed if you see a green block which its text is 'Success!'.</p> + <div class="container"> + <!-- This is the square that should not be visible if the test passes --> + <div class="greenSquare">Success!</div> + </div> + + +</body></html>
\ No newline at end of file diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-order-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-order-ref.xht index 59ac9bb732f..d5fb2ae3f5e 100644 --- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-order-ref.xht +++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/ttwf-reftest-flex-order-ref.xht @@ -23,10 +23,7 @@ <body> <p>The test passed if all the cells are reversed.</p> <div class="container"> - <span class="first">forth</span> - <span class="second">third</span> - <span class="third">second</span> - <span class="forth">first</span> + <span class="first">forth</span><span class="second">third</span><span class="third">second</span><span class="forth">first</span> </div> |