Auto merge of #13445 - pcwalton:button-whitespace, r=mbrubeck

resources: Give button elements `white-space: normal` again.

Fixes Twitter.

Originally regressed in 0a86543e6d.

r? @metajack

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13445)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-30 13:16:56 -05:00 committed by GitHub
commit 6693c92c03
4 changed files with 40 additions and 1 deletions

View file

@ -9,7 +9,6 @@ input {
color: black;
font-family: sans-serif;
font-size: 0.8333em;
white-space: pre;
text-align: left;
line-height: 1.8;
}
@ -132,6 +131,10 @@ textarea {
-servo-overflow-clip-box: content-box;
}
input:not([type=radio i]):not([type=checkbox i]):not([type=reset i]):not([type=button i]):not([type=submit i]) {
white-space: pre;
}
textarea {
overflow: auto;
}

View file

@ -1220,6 +1220,18 @@
"url": "/_mozilla/css/button_css_width.html"
}
],
"css/button_whitespace_a.html": [
{
"path": "css/button_whitespace_a.html",
"references": [
[
"/_mozilla/css/button_whitespace_ref.html",
"=="
]
],
"url": "/_mozilla/css/button_whitespace_a.html"
}
],
"css/calc-basic.html": [
{
"path": "css/calc-basic.html",
@ -14918,6 +14930,18 @@
"url": "/_mozilla/css/button_css_width.html"
}
],
"css/button_whitespace_a.html": [
{
"path": "css/button_whitespace_a.html",
"references": [
[
"/_mozilla/css/button_whitespace_ref.html",
"=="
]
],
"url": "/_mozilla/css/button_whitespace_a.html"
}
],
"css/calc-basic.html": [
{
"path": "css/calc-basic.html",

View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title></title>
<link rel="match" href="button_whitespace_ref.html">
<button>A
B</button>

View file

@ -0,0 +1,5 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title></title>
<button>A B</button>