diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-10-07 12:30:34 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-10-07 12:30:34 -0600 |
| commit | 543f11b62b9da6a5362f96e5c85f660ee68acf76 (patch) | |
| tree | 6bc0a8443bda06c547daaec117b2710f234e9489 | |
| parent | ae946a9b762d66f01f669ff526eff5c0eaaa3404 (diff) | |
| parent | a4352b1da2e1b81f78bb654d7d4b63c282a24cb7 (diff) | |
| download | servo-543f11b62b9da6a5362f96e5c85f660ee68acf76.tar.gz servo-543f11b62b9da6a5362f96e5c85f660ee68acf76.zip | |
auto merge of #3602 : pcwalton/servo/max-height-input, r=jdm
Some pages, like Google, want to set height explicitly.
r? @jdm
| -rw-r--r-- | components/style/user-agent.css | 2 | ||||
| -rw-r--r-- | tests/ref/basic.list | 1 | ||||
| -rw-r--r-- | tests/ref/input_height_a.html | 8 | ||||
| -rw-r--r-- | tests/ref/input_height_ref.html | 8 |
4 files changed, 18 insertions, 1 deletions
diff --git a/components/style/user-agent.css b/components/style/user-agent.css index b1f7c6f10cf..076d82ccd3d 100644 --- a/components/style/user-agent.css +++ b/components/style/user-agent.css @@ -116,7 +116,7 @@ area:link, link:link { color: blue } script { display: none } style { display: none } -input { background: white; min-height: 1.0em; max-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; } input[type="button"], input[type="submit"], input[type="reset"] { background: lightgrey; border-top: solid 1px #EEEEEE; border-left: solid 1px #CCCCCC; border-right: solid 1px #999999; border-bottom: solid 1px #999999; text-align: center; vertical-align: middle; color: black; } diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 47d3130e4c7..0a59a793e78 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -164,3 +164,4 @@ fragment=top != ../html/acid2.html acid2_ref.html == vertical_align_text_bottom_a.html vertical_align_text_bottom_ref.html == inline_hypothetical_box_a.html inline_hypothetical_box_ref.html == box_sizing_border_box_a.html box_sizing_border_box_ref.html +!= input_height_a.html input_height_ref.html diff --git a/tests/ref/input_height_a.html b/tests/ref/input_height_a.html new file mode 100644 index 00000000000..7c6f7dbfa8a --- /dev/null +++ b/tests/ref/input_height_a.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<body> +<!-- We assume that inputs are not 100px high on any platform, since that would be absurd --> +<input type=text style="height: 100px;"></input> +</body> +</html> + diff --git a/tests/ref/input_height_ref.html b/tests/ref/input_height_ref.html new file mode 100644 index 00000000000..c3d507e768e --- /dev/null +++ b/tests/ref/input_height_ref.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<body> +<input type=text></input> +</body> +</html> + + |