diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-31 22:50:29 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-31 22:50:29 +0530 |
| commit | f10c01cd39842e7a98198e8b9edd11fb59306157 (patch) | |
| tree | bf9f9a708fc81393df3b80a7a0ecab9f91cf73af | |
| parent | 84a3dee67ea7a45d6ec505f59c7a55162621f11e (diff) | |
| parent | c13ea8a2530fa892b085c16894de5c2789c94863 (diff) | |
| download | servo-f10c01cd39842e7a98198e8b9edd11fb59306157.tar.gz servo-f10c01cd39842e7a98198e8b9edd11fb59306157.zip | |
Auto merge of #10249 - canaltinova:master, r=jdm
Make input elements not inherit parent containers alignment
Fixes #10234 .
<!-- 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/10249)
<!-- Reviewable:end -->
| -rw-r--r-- | resources/servo.css | 2 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 24 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/input_alignment_a.html | 16 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/input_alignment_ref.html | 12 |
4 files changed, 53 insertions, 1 deletions
diff --git a/resources/servo.css b/resources/servo.css index 5f0bcdf695f..73d621a7573 100644 --- a/resources/servo.css +++ b/resources/servo.css @@ -1,4 +1,4 @@ -input { background: white; min-height: 1.0em; padding: 0em; padding-left: 0.25em; padding-right: 0.25em; border: solid lightgrey 1px; color: black; white-space: nowrap; } +input { background: white; min-height: 1.0em; padding: 0em; padding-left: 0.25em; padding-right: 0.25em; border: solid lightgrey 1px; color: black; white-space: nowrap; text-align: left; } textarea { background: white; min-height: 1.0em; padding: 0em; padding-left: 0.25em; padding-right: 0.25em; border: solid lightgrey 1px; color: black; white-space: pre; } button, input[type="button"], diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index e3841e63a71..fd4ce6b53a0 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -2528,6 +2528,18 @@ "url": "/_mozilla/css/inline_whitespace_b.html" } ], + "css/input_alignment_a.html": [ + { + "path": "css/input_alignment_a.html", + "references": [ + [ + "/_mozilla/css/input_alignment_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/input_alignment_a.html" + } + ], "css/input_button_margins_a.html": [ { "path": "css/input_button_margins_a.html", @@ -8926,6 +8938,18 @@ "url": "/_mozilla/css/inline_whitespace_b.html" } ], + "css/input_alignment_a.html": [ + { + "path": "css/input_alignment_a.html", + "references": [ + [ + "/_mozilla/css/input_alignment_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/input_alignment_a.html" + } + ], "css/input_button_margins_a.html": [ { "path": "css/input_button_margins_a.html", diff --git a/tests/wpt/mozilla/tests/css/input_alignment_a.html b/tests/wpt/mozilla/tests/css/input_alignment_a.html new file mode 100644 index 00000000000..9a2262e3b47 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/input_alignment_a.html @@ -0,0 +1,16 @@ +<!doctype html> +<html> +<head> + <title>Input elements shouldn't inherit parent containers alignment</title> + <link rel="match" href="input_alignment_ref.html"> + <style> + div { + text-align: center; + float: left; + } + </style> +</head> +<body> + <div><input value="test" /></div> +</body> +</html>
\ No newline at end of file diff --git a/tests/wpt/mozilla/tests/css/input_alignment_ref.html b/tests/wpt/mozilla/tests/css/input_alignment_ref.html new file mode 100644 index 00000000000..7c845c6d31a --- /dev/null +++ b/tests/wpt/mozilla/tests/css/input_alignment_ref.html @@ -0,0 +1,12 @@ +<!doctype html> +<html> +<head> + <title>Input elements shouldn't inherit parent containers alignment</title> + <style> + div { float: left; } + </style> +</head> +<body> + <div><input value="test" /></div> +</body> +</html>
\ No newline at end of file |