diff --git a/resources/servo.css b/resources/servo.css
index 5fdc469b699..354717deb70 100644
--- a/resources/servo.css
+++ b/resources/servo.css
@@ -1,4 +1,3 @@
-input, textarea, select { display: inline-block; }
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; }
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,
diff --git a/resources/user-agent.css b/resources/user-agent.css
index 0971ee8eee4..bfdb1607465 100644
--- a/resources/user-agent.css
+++ b/resources/user-agent.css
@@ -251,6 +251,7 @@ input[type="submit"], select, button {
box-sizing: border-box;
}
+input, textarea, select, button { display: inline-block; }
hr { color: gray; border-style: inset; border-width: 1px; margin: 0.5em auto; }
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 98efe89c687..63c0c8a7eef 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -947,6 +947,18 @@
"url": "/_mozilla/css/case-insensitive-font-family.html"
}
],
+ "css/button_css_width.html": [
+ {
+ "path": "css/button_css_width.html",
+ "references": [
+ [
+ "/_mozilla/css/button_css_width_ref.html",
+ "=="
+ ]
+ ],
+ "url": "/_mozilla/css/button_css_width.html"
+ }
+ ],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",
@@ -5472,6 +5484,18 @@
"url": "/_mozilla/css/case-insensitive-font-family.html"
}
],
+ "css/button_css_width.html": [
+ {
+ "path": "css/button_css_width.html",
+ "references": [
+ [
+ "/_mozilla/css/button_css_width_ref.html",
+ "=="
+ ]
+ ],
+ "url": "/_mozilla/css/button_css_width.html"
+ }
+ ],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",
diff --git a/tests/wpt/mozilla/tests/css/button_css_width.html b/tests/wpt/mozilla/tests/css/button_css_width.html
new file mode 100644
index 00000000000..8013fca55c0
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/button_css_width.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/mozilla/tests/css/button_css_width_ref.html b/tests/wpt/mozilla/tests/css/button_css_width_ref.html
new file mode 100644
index 00000000000..8e4ef5646be
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/button_css_width_ref.html
@@ -0,0 +1,3 @@
+
+
+