Skip to content

Commit 4af8564

Browse files
committed
[shadow-styling] Put the inheritance section under the cascade section.
1 parent 2541254 commit 4af8564

2 files changed

Lines changed: 21 additions & 20 deletions

File tree

shadow-styling/Overview.bs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@ Distribution Lists</h3>
5757
as if they all replaced the <a>insertion point</a> in-place.
5858
<span class='note'>(Akin to the behavior of ''display-box: contents''.)</span>
5959

60-
<h3 id='inheritance'>
61-
Inheritance and Shadow DOM</h3>
62-
63-
The <a>top-level elements</a> of a <a>shadow tree</a>
64-
inherit from their <a>host element</a>.
65-
66-
The elements in a <a>distribution list</a> inherit from the parent of the <a element>content</a> element they are ultimately distributed to,
67-
rather than from their normal parent.
68-
6960
<h2 id='selectors-data-model'>
7061
Extensions to the Selectors Data Model</h2>
7162

@@ -162,6 +153,15 @@ Changes to the Cascading Model</h2>
162153
defined by the Shadow DOM specification,
163154
is used to calculate ordering.
164155

156+
<h3 id='inheritance'>
157+
Inheritance and Shadow DOM</h3>
158+
159+
The <a>top-level elements</a> of a <a>shadow tree</a>
160+
inherit from their <a>host element</a>.
161+
162+
The elements in a <a>distribution list</a> inherit from the parent of the <a element>content</a> element they are ultimately distributed to,
163+
rather than from their normal parent.
164+
165165

166166

167167

shadow-styling/Overview.html

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,13 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
110110
<li><a href=#shadow-dom><span class=secno>2</span> Shadow DOM CSS Concepts</a>
111111
<ul class=toc>
112112
<li><a href=#shadow-trees><span class=secno>2.1</span> Shadow Trees</a>
113-
<li><a href=#distribution-lists><span class=secno>2.2</span> Distribution Lists</a>
114-
<li><a href=#inheritance0><span class=secno>2.3</span> Inheritance and Shadow DOM</a></ul>
113+
<li><a href=#distribution-lists><span class=secno>2.2</span> Distribution Lists</a></ul>
115114
<li><a href=#selectors-data-model><span class=secno>3</span> Extensions to the Selectors Data Model</a>
116115
<ul class=toc>
117116
<li><a href=#host-element><span class=secno>3.1</span> Host Elements in a Shadow Tree</a></ul>
118117
<li><a href=#cascading><span class=secno>4</span> Changes to the Cascading Model</a>
118+
<ul class=toc>
119+
<li><a href=#inheritance0><span class=secno>4.1</span> Inheritance and Shadow DOM</a></ul>
119120
<li><a href=#inheritance><span class=secno>5</span> Shadow DOM Combinators</a>
120121
<ul class=toc>
121122
<li><a href=#shadow-combinator><span class=secno>5.1</span> Selecting Into A Shadow Tree: the <span class=css data-link-type=maybe title=/shadow/>/shadow/</span> combinator</a>
@@ -191,15 +192,6 @@ <h3 class="heading settled heading" data-level=2.2 id=distribution-lists><span c
191192
as if they all replaced the <a data-link-type=dfn href=#insertion-point title="insertion point">insertion point</a> in-place.
192193
<span class=note>(Akin to the behavior of <a class=css data-link-type=propdesc href=http://dev.w3.org/csswg/css-display-3/#propdef-display-box title=display-box>display-box: contents</a>.)</span>
193194

194-
<h3 class="heading settled heading" data-level=2.3 id=inheritance0><span class=secno>2.3 </span><span class=content>
195-
Inheritance and Shadow DOM</span><a class=self-link href=#inheritance0></a></h3>
196-
197-
<p> The <a data-link-type=dfn href=#top-level-element title="top-level elements">top-level elements</a> of a <a data-link-type=dfn href=#shadow-tree title="shadow tree">shadow tree</a>
198-
inherit from their <a data-link-type=dfn href=#host-element0 title="host element">host element</a>.
199-
200-
<p> The elements in a <a data-link-type=dfn href=#distribution-list title="distribution list">distribution list</a> inherit from the parent of the <a data-link-type=element title=content>content</a> element they are ultimately distributed to,
201-
rather than from their normal parent.
202-
203195
<h2 class="heading settled heading" data-level=3 id=selectors-data-model><span class=secno>3 </span><span class=content>
204196
Extensions to the Selectors Data Model</span><a class=self-link href=#selectors-data-model></a></h2>
205197

@@ -296,6 +288,15 @@ <h2 class="heading settled heading" data-level=4 id=cascading><span class=secno>
296288
defined by the Shadow DOM specification,
297289
is used to calculate ordering.
298290

291+
<h3 class="heading settled heading" data-level=4.1 id=inheritance0><span class=secno>4.1 </span><span class=content>
292+
Inheritance and Shadow DOM</span><a class=self-link href=#inheritance0></a></h3>
293+
294+
<p> The <a data-link-type=dfn href=#top-level-element title="top-level elements">top-level elements</a> of a <a data-link-type=dfn href=#shadow-tree title="shadow tree">shadow tree</a>
295+
inherit from their <a data-link-type=dfn href=#host-element0 title="host element">host element</a>.
296+
297+
<p> The elements in a <a data-link-type=dfn href=#distribution-list title="distribution list">distribution list</a> inherit from the parent of the <a data-link-type=element title=content>content</a> element they are ultimately distributed to,
298+
rather than from their normal parent.
299+
299300

300301

301302

0 commit comments

Comments
 (0)