Auto merge of #10809 - perlun:sendoushi-master, r=jdm

Fixed line-height for input and textarea + use correct font

Fixes #10532.

Replaces #10553 since @Sendoushi had problems getting a proper rebase locally, so helping him out to get this merged.

(Credits to Sendoushi who did the actual changes; I'm just helping out to getting things into a mergeable state.)

<!-- 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/10809)
<!-- Reviewable:end -->

8 files changed, 56 insertions, 16 deletions

diff --git a/resources/servo.css b/resources/servo.css
index 0ef23b8f86d..1233d73ac17 100644
--- a/resources/servo.css
+++ b/resources/servo.css
@@ -1,5 +1,6 @@
-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                   { background: white; min-height: 1.0em; padding: 0em; padding-left: 0.25em; padding-right: 0.25em; border: solid lightgrey 1px; color: black; font-family: sans-serif; font-size: 0.7em; white-space: nowrap; text-align: left; line-height: 1.8; }
+textarea                { background: white; min-height: 1.0em; padding: 0em; padding-left: 0.25em; padding-right: 0.25em; border: solid lightgrey 1px; color: black; font-family: sans-serif; font-size: 0.7em; white-space: pre; }
 input::selection,
 textarea::selection     { background: rgba(176, 214, 255, 1.0); color: black; }
 button,
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini
new file mode 100644
index 00000000000..4dc53b8f843
--- /dev/null
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini
@@ -0,0 +1,4 @@
+[transform-input-017.htm]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/10881
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
index 1c005ae8a57..69c5b778d30 100644
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
@@ -1,5 +1,4 @@
 [transform-input-018.htm]
   type: reftest
-  expected:
-    if os == "mac": PASS
-    FAIL
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/10881
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index bc31d8c61a5..1c0f071c85f 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2700,6 +2700,18 @@
             "url": "/_mozilla/css/input_insertion_point_empty_a.html"
           }
         ],
+        "css/input_line_height.html": [
+          {
+            "path": "css/input_line_height.html",
+            "references": [
+              [
+                "/_mozilla/css/input_line_height_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/input_line_height.html"
+          }
+        ],
         "css/input_placeholder.html": [
           {
             "path": "css/input_placeholder.html",
@@ -9446,6 +9458,18 @@
           "url": "/_mozilla/css/input_insertion_point_empty_a.html"
         }
       ],
+      "css/input_line_height.html": [
+        {
+          "path": "css/input_line_height.html",
+          "references": [
+            [
+              "/_mozilla/css/input_line_height_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/input_line_height.html"
+        }
+      ],
       "css/input_placeholder.html": [
         {
           "path": "css/input_placeholder.html",
diff --git a/tests/wpt/mozilla/tests/css/input_line_height.html b/tests/wpt/mozilla/tests/css/input_line_height.html
new file mode 100644
index 00000000000..1de07c88ae2
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/input_line_height.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Input elements shouldn't inherit parent containers line height</title>
+    <link rel="match" href="input_line_height_ref.html">
+</head>
+<body>
+<div style="line-height: 100px">
+    <input type="text"></input>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/css/input_line_height_ref.html b/tests/wpt/mozilla/tests/css/input_line_height_ref.html
new file mode 100644
index 00000000000..16d4fd99712
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/input_line_height_ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Input elements shouldn't inherit parent containers line height</title>
+</head>
+<body>
+<div style="line-height: 100px">
+    <input type="text" style="line-height: 1.8"></input>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/css/submit_focus_a.html b/tests/wpt/mozilla/tests/css/submit_focus_a.html
index e351bd22fa7..2f45fb0ac1b 100644
--- a/tests/wpt/mozilla/tests/css/submit_focus_a.html
+++ b/tests/wpt/mozilla/tests/css/submit_focus_a.html
@@ -1,9 +1,4 @@
 <link rel='match' href='submit_focus_b.html'>
-<style>
-button {
-    display: inline-block;
-}
-</style>
 <button id="1">Submit</button>
 <script>
 var elem = document.getElementById('1');
diff --git a/tests/wpt/mozilla/tests/css/submit_focus_b.html b/tests/wpt/mozilla/tests/css/submit_focus_b.html
index 1cedc3523a7..732c705b400 100644
--- a/tests/wpt/mozilla/tests/css/submit_focus_b.html
+++ b/tests/wpt/mozilla/tests/css/submit_focus_b.html
@@ -1,9 +1,3 @@
-<style>
-input {
-    padding-left: 0;
-    padding-right: 0;
-}
-</style>
 <input id="1" type="submit"></input>
 <script>
 var elem = document.getElementById('1');