Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit b96acae

Browse files
frivoalfrivoal
authored
Merge branch 'master' into caret-color-resolved-value
2 parents 5b3a864 + 1abd1b8 commit b96acae

File tree

55 files changed

+1397
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1397
-29
lines changed

‎css-color-4/hex-002.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
55
<link rel="help" href="https://drafts.csswg.org/css-color-4/#hex-notation">
66
<link rel="match" href="greentext-ref.html">
7-
<meta name="assert" content="8 digit hex">
7+
<meta name="assert" content="8 digit hex, fully opaque">
88
<style>
99
.test {color: #008000FF}
1010
</style>

‎css-color-4/hex-004.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<title>CSS Color 4: The RGB hexadecimal notations: #RRGGBB</title>
44
<link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
55
<link rel="help" href="https://drafts.csswg.org/css-color-4/#hex-notation">
6-
<meta name="assert" content="4 digit hex">
6+
<meta name="assert" content="4 digit hex, fully opaque">
77
<style>
88
.test {color: #070F}
99
</style>

‎css-display-3/display-contents-computed-style.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<title>CSS Display: Computed style for display:contents</title>
44
<link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com">
55
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
6+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#transformations">
67
<link rel="help" href="https://drafts.csswg.org/cssom-1/#resolved-values">
78
<script src="/resources/testharness.js"></script>
89
<script src="/resources/testharnessreport.js"></script>
910
<style>
10-
.contents { display: contents }
11+
html, .contents { display: contents }
1112

1213
#t2 .contents { background-color: green }
1314
#t2 span { background-color: inherit }
@@ -66,4 +67,8 @@
6667
assert_equals(computed.marginLeft, "25%");
6768
assert_equals(computed.paddingTop, "10%");
6869
}, "Resolved value should be computed value, not used value, for display:contents");
70+
71+
test(function(){
72+
assert_equals(getComputedStyle(document.documentElement).display, "block");
73+
}, "display:contents is blockified for root elements");
6974
</script>

‎css-display-3/display-contents-dynamic-flex-001-inline.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Display 3: Display contents reattachment works well in a flex container</title>
4+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
5+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
6+
<link rel="match" href="display-contents-flex-001-ref.html">
7+
<script src="support/util.js"></script>
8+
<style>
9+
.flex {
10+
display: flex;
11+
}
12+
.inline {
13+
display: inline;
14+
}
15+
.contents {
16+
display: contents;
17+
border: 1px solid red;
18+
}
19+
</style>
20+
<p>Test passes if you see the word "PASS", with a "0" under the first "S", and no red</p>
21+
<div class="flex">
22+
P
23+
<div class="contents">
24+
<div>A</div>
25+
</div>
26+
<div class="contents">
27+
<div class="inline">S<div>0</div></div>
28+
</div>
29+
<div class="contents">
30+
S
31+
</div>
32+
</div>
33+
<script>
34+
window.onload = function() {
35+
eachDisplayContentsElementIn(document, window,
36+
function(e) { e.style.display = 'inline'; },
37+
function(e) { e.style.display = ''; })
38+
}
39+
</script>

‎css-display-3/display-contents-dynamic-flex-001-none.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Display 3: Display contents reattachment works well in a flex container</title>
4+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
5+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
6+
<link rel="match" href="display-contents-flex-001-ref.html">
7+
<script src="support/util.js"></script>
8+
<style>
9+
.flex {
10+
display: flex;
11+
}
12+
.inline {
13+
display: inline;
14+
}
15+
.contents {
16+
display: contents;
17+
border: 1px solid red;
18+
}
19+
</style>
20+
<p>Test passes if you see the word "PASS", with a "0" under the first "S", and no red</p>
21+
<div class="flex">
22+
P
23+
<div class="contents">
24+
<div>A</div>
25+
</div>
26+
<div class="contents">
27+
<div class="inline">S<div>0</div></div>
28+
</div>
29+
<div class="contents">
30+
S
31+
</div>
32+
</div>
33+
<script>
34+
window.onload = function() {
35+
eachDisplayContentsElementIn(document, window,
36+
function(e) { e.style.display = 'none'; },
37+
function(e) { e.style.display = ''; })
38+
}
39+
</script>

‎css-display-3/display-contents-dynamic-flex-002-inline.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Test: CSS display: contents in flex layout</title>
4+
<!-- Imported from: https://bugzilla.mozilla.org/show_bug.cgi?id=907396 -->
5+
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
6+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
7+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
8+
<link rel="match" href="display-contents-flex-002-ref.html">
9+
<link rel="stylesheet" href="support/acid.css">
10+
<script src="support/util.js"></script>
11+
<div class="flex c1">
12+
0
13+
<div class="contents c1">x</div>
14+
<div class="contents c1"><div class="contents c2">y</div></div>
15+
<div class="contents c1"><div class="contents c2"><div>1<span class="b">1</span></div></div></div>
16+
<div class="contents c2"><div class="inline">2a<div>2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
17+
<div class="contents c3"><div class="inline">3</div></div>
18+
<div class="inline"><div class="contents c4">4</div></div>
19+
<div><div class="contents c5">5a</div></div>
20+
<div class="c5">5b</div>
21+
<div class="contents c6"><div>6</div></div>
22+
<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
23+
<div class="contents c9"><div>8</div></div>
24+
<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
25+
<div class="contents c10"><div>10</div></div>
26+
</div>
27+
<script>
28+
window.onload = function() {
29+
eachDisplayContentsElementIn(document, window,
30+
function(e) { e.style.display = 'inline'; },
31+
function(e) { e.style.display = ''; })
32+
}
33+
</script>

‎css-display-3/display-contents-dynamic-flex-002-none.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Test: CSS display: contents in flex layout</title>
4+
<!-- Imported from: https://bugzilla.mozilla.org/show_bug.cgi?id=907396 -->
5+
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
6+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
7+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
8+
<link rel="match" href="display-contents-flex-002-ref.html">
9+
<link rel="stylesheet" href="support/acid.css">
10+
<script src="support/util.js"></script>
11+
<div class="flex c1">
12+
0
13+
<div class="contents c1">x</div>
14+
<div class="contents c1"><div class="contents c2">y</div></div>
15+
<div class="contents c1"><div class="contents c2"><div>1<span class="b">1</span></div></div></div>
16+
<div class="contents c2"><div class="inline">2a<div>2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
17+
<div class="contents c3"><div class="inline">3</div></div>
18+
<div class="inline"><div class="contents c4">4</div></div>
19+
<div><div class="contents c5">5a</div></div>
20+
<div class="c5">5b</div>
21+
<div class="contents c6"><div>6</div></div>
22+
<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
23+
<div class="contents c9"><div>8</div></div>
24+
<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
25+
<div class="contents c10"><div>10</div></div>
26+
</div>
27+
<script>
28+
window.onload = function() {
29+
eachDisplayContentsElementIn(document, window,
30+
function(e) { e.style.display = 'none'; },
31+
function(e) { e.style.display = ''; })
32+
}
33+
</script>

‎css-display-3/display-contents-dynamic-flex-003-inline.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Test: CSS display: contents in flex layout</title>
4+
<!-- Imported from: https://bugzilla.mozilla.org/show_bug.cgi?id=907396 -->
5+
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
6+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
7+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
8+
<link rel="match" href="display-contents-flex-002-ref.html">
9+
<link rel="stylesheet" href="support/acid.css">
10+
<script src="support/util.js"></script>
11+
<div class="flex"><div class="contents c1">
12+
0
13+
<div class="contents c1">x</div>
14+
<div class="contents c1"><div class="contents c2">y</div></div>
15+
<div class="contents c1"><div class="contents c2"><div>1<span class="b">1</span></div></div></div>
16+
<div class="contents c2"><div class="inline">2a<div>2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
17+
<div class="contents c3"><div class="inline">3</div></div>
18+
<div><div class="contents c4">4</div></div>
19+
<div><div class="contents c5">5a</div></div>
20+
<div class="c5">5b</div>
21+
<div class="contents c6"><div>6</div></div>
22+
<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
23+
<div class="contents c9"><div>8</div></div>
24+
<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
25+
<div class="contents c10"><div>10</div></div>
26+
</div></div>
27+
<script>
28+
window.onload = function() {
29+
eachDisplayContentsElementIn(document, window,
30+
function(e) { e.style.display = 'inline'; },
31+
function(e) { e.style.display = ''; })
32+
}
33+
</script>

‎css-display-3/display-contents-dynamic-flex-003-none.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Test: CSS display: contents in flex layout</title>
4+
<!-- Imported from: https://bugzilla.mozilla.org/show_bug.cgi?id=907396 -->
5+
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
6+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
7+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
8+
<link rel="match" href="display-contents-flex-002-ref.html">
9+
<link rel="stylesheet" href="support/acid.css">
10+
<script src="support/util.js"></script>
11+
<div class="flex"><div class="contents c1">
12+
0
13+
<div class="contents c1">x</div>
14+
<div class="contents c1"><div class="contents c2">y</div></div>
15+
<div class="contents c1"><div class="contents c2"><div>1<span class="b">1</span></div></div></div>
16+
<div class="contents c2"><div class="inline">2a<div>2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
17+
<div class="contents c3"><div class="inline">3</div></div>
18+
<div><div class="contents c4">4</div></div>
19+
<div><div class="contents c5">5a</div></div>
20+
<div class="c5">5b</div>
21+
<div class="contents c6"><div>6</div></div>
22+
<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
23+
<div class="contents c9"><div>8</div></div>
24+
<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
25+
<div class="contents c10"><div>10</div></div>
26+
</div></div>
27+
<script>
28+
window.onload = function() {
29+
eachDisplayContentsElementIn(document, window,
30+
function(e) { e.style.display = 'none'; },
31+
function(e) { e.style.display = ''; })
32+
}
33+
</script>

‎css-display-3/display-contents-dynamic-inline-flex-001-inline.html‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>CSS Test: CSS display: contents in inline-flex layout</title>
4+
<!-- Imported from: https://bugzilla.mozilla.org/show_bug.cgi?id=907396 -->
5+
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
6+
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
7+
<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
8+
<link rel="match" href="display-contents-inline-flex-001-ref.html">
9+
<link rel="stylesheet" href="support/acid.css">
10+
<script src="support/util.js"></script>
11+
<div style="color: red">
12+
<div class="iflex"><div class="contents c2">
13+
0
14+
</div></div>
15+
<div class="iflex"><div class="contents c2">
16+
0
17+
<div class="contents c1">1</div>
18+
2
19+
</div></div>
20+
<div class="iflex"><div class="contents c2">
21+
0
22+
<div class="c1">1</div>
23+
2
24+
</div></div>
25+
<div class="iflex c3">
26+
0
27+
<div class="contents c2"><div class="c1">1</div></div>
28+
2
29+
</div>
30+
<div class="iflex c3">
31+
<div class="contents c2">0</div>
32+
<div class="contents c2"><div class="c1">1</div></div>
33+
<div class="contents c2">2</div>
34+
</div>
35+
<div class="iflex c3">
36+
<div class="inline">0</div>
37+
<div class="contents"><div class="inline c1">1</div></div>
38+
<div class="inline">2</div>
39+
</div>
40+
</div>
41+
<script>
42+
window.onload = function() {
43+
eachDisplayContentsElementIn(document, window,
44+
function(e) { e.style.display = 'none'; },
45+
function(e) { e.style.display = ''; })
46+
}
47+
</script>

0 commit comments

Comments
 (0)