Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-05-01 16:22:17 -07:00
commit e65009f317
8 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/servo.css
View file

@ -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; } button,
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; } 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, input::selection,
textarea::selection { background: rgba(176, 214, 255, 1.0); color: black; } textarea::selection { background: rgba(176, 214, 255, 1.0); color: black; }
button, button,

4
tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini Normal file
View file

@ -0,0 +1,4 @@
[transform-input-017.htm]
type: reftest
expected: FAIL
bug: https://github.com/servo/servo/issues/10881

5
tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
View file

@ -1,5 +1,4 @@
[transform-input-018.htm] [transform-input-018.htm]
type: reftest type: reftest
expected: expected: FAIL
if os == "mac": PASS bug: https://github.com/servo/servo/issues/10881
FAIL

24
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -2700,6 +2700,18 @@
"url": "/_mozilla/css/input_insertion_point_empty_a.html" "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": [ "css/input_placeholder.html": [
{ {
"path": "css/input_placeholder.html", "path": "css/input_placeholder.html",
@ -9446,6 +9458,18 @@
"url": "/_mozilla/css/input_insertion_point_empty_a.html" "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": [ "css/input_placeholder.html": [
{ {
"path": "css/input_placeholder.html", "path": "css/input_placeholder.html",

12
tests/wpt/mozilla/tests/css/input_line_height.html Normal file
View file

@ -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>

11
tests/wpt/mozilla/tests/css/input_line_height_ref.html Normal file
View file

@ -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>

5
tests/wpt/mozilla/tests/css/submit_focus_a.html
View file

@ -1,9 +1,4 @@
<link rel='match' href='submit_focus_b.html'> <link rel='match' href='submit_focus_b.html'>
<style>
button {
display: inline-block;
}
</style>
<button id="1">Submit</button> <button id="1">Submit</button>
<script> <script>
var elem = document.getElementById('1'); var elem = document.getElementById('1');

6
tests/wpt/mozilla/tests/css/submit_focus_b.html
View file

@ -1,9 +1,3 @@
<style>
input {
padding-left: 0;
padding-right: 0;
}
</style>
<input id="1" type="submit"></input> <input id="1" type="submit"></input>
<script> <script>
var elem = document.getElementById('1'); var elem = document.getElementById('1');