Skip to content

Commit

Permalink
renamed text-decoration-width to text-decoration-thickness
Browse files Browse the repository at this point in the history
Differential Revision: https://phabricator.services.mozilla.com/D38586

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1567282
gecko-commit: 35043a8b9d81b3216fee30fa1ac1c2261a38dcfd
gecko-integration-branch: autoland
gecko-reviewers: dholbert
  • Loading branch information
Charlie Marlow authored and moz-wptsync-bot committed Jul 20, 2019
1 parent c23028e commit 102126b
Show file tree
Hide file tree
Showing 18 changed files with 92 additions and 92 deletions.
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Non-reference case for text-decoration-width</title>
<title>Non-reference case for text-decoration-thickness</title>
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#main {
Expand Down
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Reference case for text-decoration-width</title>
<title>Reference case for text-decoration-thickness</title>
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
div{
Expand Down
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Reference case for text-decoration-width</title>
<title>Reference case for text-decoration-thickness</title>
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand Down
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Reference case for text-decoration-width</title>
<title>Reference case for text-decoration-thickness</title>
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand Down
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<meta name="assert" content="text-decoration-width: should affect the underline thickness">
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration-thickness: should affect the underline thickness">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="mismatch" href="reference/text-decoration-width-001-notref.html">
<link rel="mismatch" href="reference/text-decoration-thickness-001-notref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#main {
Expand All @@ -21,7 +21,7 @@
padding-right: 1em;
}
#rightbox {
text-decoration-width: 2em;
text-decoration-thickness: 2em;
}
</style>
</head>
Expand Down
Expand Up @@ -2,19 +2,19 @@
<html>
<head>
<meta charset="utf-8">
<title>CSS Text Decoration Test: parsing text-decoration-width computed values</title>
<title>CSS Text Decoration Test: parsing text-decoration-thickness computed values</title>
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<meta name="assert" content="text-decoration-width computed value is as specified.">
<meta name="assert" content="text-decoration-thickness computed value is as specified.">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/computed-testcommon.js"></script>
</head>
<body>
<div id="target"></div>
<script>
test_computed_value("text-decoration-width", "auto");
test_computed_value("text-decoration-width", "from-font");
test_computed_value("text-decoration-width", "calc(10px - 8px)", "2px");
test_computed_value("text-decoration-thickness", "auto");
test_computed_value("text-decoration-thickness", "from-font");
test_computed_value("text-decoration-thickness", "calc(10px - 8px)", "2px");
</script>
</body>
</html>
Expand Up @@ -4,14 +4,14 @@
<meta charset="utf-8">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<link rel="help" title="2.4 Text Decoration Width: the 'text-decoration-width' property"
<link rel="help" title="2.4 Text Decoration Width: the 'text-decoration-thickness' property"
href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property" />
</head>
<body>
<script>
test(function() {
assert_equals(getComputedStyle(document.body)["text-decoration-width"], "auto", "Must be set to value auto as initial value.");
}, "Initial value of text-decoration-width should be auto");
assert_equals(getComputedStyle(document.body)["text-decoration-thickness"], "auto", "Must be set to value auto as initial value.");
}, "Initial value of text-decoration-thickness should be auto");
</script>
</body>
</html>
27 changes: 27 additions & 0 deletions css/css-text-decor/text-decoration-thickness-invalid.html
@@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>CSS Text Decoration Test: parsing text-decoration-thickness with invalid values</title>
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<meta name="assert" content="text-decoration-thickness supports the following values: auto | from-font | <length>">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/parsing-testcommon.js"></script>
</head>
<body>
<script>
test_invalid_value("text-decoration-thickness", "otto");
test_invalid_value("text-decoration-thickness", "asdlflj");
test_invalid_value("text-decoration-thickness", "-10");
test_invalid_value("text-decoration-thickness", "60002020");
test_invalid_value("text-decoration-thickness", "!@#$%^&");
test_invalid_value("text-decoration-thickness", "10e2");
test_invalid_value("text-decoration-thickness", "from font");
test_invalid_value("text-decoration-thickness", "10%");
test_invalid_value("text-decoration-thickness", "-27%");
test_invalid_value("text-decoration-thickness", "calc(40% - 20px)");
test_invalid_value("text-decoration-thickness", "calc(100% - 40em)");
</script>
</body>
</html>
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<meta name="assert" content="text-decoration-width; the width of the decoration line is increased">
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration-thickness; the width of the decoration line is increased">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="match" href="reference/text-decoration-width-green-rect-ref.html">
<link rel="match" href="reference/text-decoration-thickness-green-rect-ref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
div{
Expand All @@ -22,7 +22,7 @@
* it will entirely cover the div's content-box (making it fully green) as long
* as the line-through is approximately centered, vertically.
*/
text-decoration-width: 1.1em;
text-decoration-thickness: 1.1em;
}
</style>
</head>
Expand Down
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<meta name="assert" content="text-decoration-width: the width of the decoration line is increased">
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration-thickness: the width of the decoration line is increased">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="match" href="reference/text-decoration-width-green-rect-ref.html">
<link rel="match" href="reference/text-decoration-thickness-green-rect-ref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand All @@ -27,7 +27,7 @@
top: 3em;
text-decoration: green overline;
text-decoration-skip-ink: none;
text-decoration-width: 4em;
text-decoration-thickness: 4em;
}
</style>
</head>
Expand Down
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<meta name="assert" content="text-decoration-width: increased width text decorations don't create scrollable overflow">
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration-thickness: increased width text decorations don't create scrollable overflow">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="match" href="reference/text-decoration-width-scroll-001-ref.html">
<link rel="match" href="reference/text-decoration-thickness-scroll-001-ref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand All @@ -29,7 +29,7 @@
color: transparent;
text-decoration: green underline;
text-decoration-skip-ink: none;
text-decoration-width: 8em;
text-decoration-thickness: 8em;
}
</style>
</head>
Expand Down
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<meta name="assert" content="text-decoration-width: the width of the decoration line is increased">
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration-thickness: the width of the decoration line is increased">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="match" href="reference/text-decoration-width-green-rect-ref.html">
<link rel="match" href="reference/text-decoration-thickness-green-rect-ref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand All @@ -27,7 +27,7 @@
bottom: 3em;
text-decoration: green underline;
text-decoration-skip-ink: none;
text-decoration-width: 4em;
text-decoration-thickness: 4em;
}
</style>
</head>
Expand Down
24 changes: 24 additions & 0 deletions css/css-text-decor/text-decoration-thickness-valid.html
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>CSS Text Decoration Test: parsing text-decoration-thickness longhands with valid values</title>
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<meta name="assert" content="text-decoration-thickness supports the following values: auto | from-font | <length>">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/css/support/parsing-testcommon.js"></script>
</head>
<body>
<script>
test_valid_value("text-decoration-thickness", "auto");
test_valid_value("text-decoration-thickness", "from-font");
test_valid_value("text-decoration-thickness", "-10px");
test_valid_value("text-decoration-thickness", "2001em");
test_valid_value("text-decoration-thickness", "-49em");
test_valid_value("text-decoration-thickness", "53px");
test_valid_value("text-decoration-thickness", "calc(40em - 10px)");
test_valid_value("text-decoration-thickness", "calc(-50em + 13px)");
</script>
</body>
</html>
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<meta name="assert" content="text-decoration-width: the width of the decoration line is increased">
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration-thickness: the width of the decoration line is increased">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="match" href="reference/text-decoration-width-vertical-green-rect-ref.html">
<link rel="match" href="reference/text-decoration-thickness-vertical-green-rect-ref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand All @@ -34,7 +34,7 @@
left: 1.3em;
text-decoration: green underline;
text-decoration-skip-ink: none;
text-decoration-width: 1.5em;
text-decoration-thickness: 1.5em;
}
</style>
</head>
Expand Down
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8">
<title>Test case for text-decoration-width</title>
<title>Test case for text-decoration-thickness</title>
<meta name="assert" content="text-decoration:width; the width of the decoration line is increased">
<link rel="author" title="Charlie Marlow" href="mailto:cmarlow@mozilla.com">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property">
<link rel="match" href="reference/text-decoration-width-vertical-green-rect-ref.html">
<link rel="match" href="reference/text-decoration-thickness-vertical-green-rect-ref.html">
<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
<style>
#box{
Expand All @@ -33,7 +33,7 @@
right: 1em;
text-decoration: green underline;
text-decoration-skip-ink: none;
text-decoration-width: 1.2em;
text-decoration-thickness: 1.2em;
}
</style>
</head>
Expand Down
27 changes: 0 additions & 27 deletions css/css-text-decor/text-decoration-width-invalid.html

This file was deleted.

24 changes: 0 additions & 24 deletions css/css-text-decor/text-decoration-width-valid.html

This file was deleted.

@@ -1,6 +1,6 @@
<!doctype html>
<meta charset="utf-8">
<title>'text-decoration-width' property</title>
<title>'text-decoration-thickness' property</title>
<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-get">
<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymap-set">
<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#property-stle-value-normalization">
Expand All @@ -13,7 +13,7 @@
<script>
'use strict';

runPropertyTests('text-decoration-width', [
runPropertyTests('text-decoration-thickness', [
{ syntax: 'auto' },
{
syntax: '<length>',
Expand Down

0 comments on commit 102126b

Please sign in to comment.