Skip to content

Commit 59efb59

Browse files
committed
Merge pull request #35 from frivoal/florian/regions-bikeshed
Florian/regions bikeshed
2 parents ad5bee9 + ae35894 commit 59efb59

File tree

2 files changed

+16
-2499
lines changed

2 files changed

+16
-2499
lines changed

css-regions/Overview.src.html renamed to css-regions/Overview.bs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ <h2 id="css-regions-concepts">
254254
<h3 id="regions">
255255
Regions</h3>
256256

257-
A <dfn>CSS Region</dfn>
257+
A <dfn export>CSS Region</dfn>
258258
is a block container
259259
that has an associated
260260
<em><a>named flow</a></em>
@@ -263,7 +263,7 @@ <h3 id="regions">
263263
<h3 id="region-chain-section">
264264
Region chain</h3>
265265

266-
A <dfn>region chain</dfn>
266+
A <dfn export>region chain</dfn>
267267
is the sequence of regions
268268
that are associated with
269269
a <a>named flow</a>.
@@ -390,7 +390,7 @@ <h3 id="the-flow-into-property">
390390
are placed into the named flow.
391391
The element or content is said to have
392392
a <dfn id="specified-flow">specified flow</dfn>.
393-
The values ''none'', ''inherit'', ''default'', ''auto'' and ''initial''
393+
The values <code class=css>none</code>, <code class=css>inherit</code>, <code class=css>default</code>, <code class=css>auto</code> and <code class=css>initial</code>
394394
are invalid flow names.
395395
</dd>
396396
</dl>
@@ -413,8 +413,7 @@ <h3 id="the-flow-into-property">
413413
the default traversal order
414414
of sequential navigation modes
415415
(such as cycling through links,
416-
see e.g. 'nav-index' [[CSS3UI]]
417-
or <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#sequential-focus-navigation-and-the-tabindex-attribute"><code>tabindex</code></a> [[HTML40]]).
416+
see e.g. <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#sequential-focus-navigation-and-the-tabindex-attribute"><code>tabindex</code></a> [[HTML40]]).
418417

419418
A <a>named flow</a> needs to be associated
420419
with a <a>region chain</a>
@@ -583,14 +582,14 @@ <h3 id="flow-from">
583582
</dl>
584583

585584
If the 'content' property computes
586-
to something else than ''normal''
587-
(or ''none'' for a pseudo-element),
585+
to something else than ''content/normal''
586+
(or ''content/none'' for a pseudo-element),
588587
the block container does not become
589588
a <a>CSS Region</a>.
590589
If the 'display' property
591590
of the block container
592591
or one of its ancestors
593-
computes to ''none'',
592+
computes to ''display/none'',
594593
the block container does not become
595594
a <a>CSS Region</a>.
596595

@@ -603,7 +602,7 @@ <h3 id="flow-from">
603602
Block container pseudo-elements where
604603
the value of 'flow-from' computes to an
605604
<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#value-def-identifier">&lt;ident&gt;</a>
606-
and the value of 'content' computes to ''none''
605+
and the value of 'content' computes to ''content/none''
607606
are generated as <a>CSS Regions</a>,
608607
which is an update to the behavior
609608
described in [[!CSS21]].
@@ -1071,7 +1070,7 @@ <h3 id="the-namedflow-interface">
10711070
that are in the <code>NULL</code> state.
10721071

10731072
The
1074-
<dfn interface><code class="idl">NamedFlowMap</code></dfn>
1073+
{{NamedFlowMap}}
10751074
interface provides a map of current
10761075
<a idl>NamedFlow</a> instances
10771076
in the document.
@@ -1107,7 +1106,7 @@ <h3 id="the-namedflow-interface">
11071106
uses the rest of the default map
11081107
<a href="http://dev.w3.org/2006/webapi/WebIDL/#es-map-members">class methods</a>.
11091108

1110-
The <dfn interface><code class="idl">NamedFlow</code></dfn>
1109+
The {{NamedFlow}}
11111110
interface offers a representation
11121111
of a <a>named flow</a> instance.
11131112

@@ -1214,7 +1213,7 @@ <h3 id="the-namedflow-interface">
12141213
<h3 id="the-region-interface">
12151214
The Region interface</h3>
12161215

1217-
The <dfn interface><code class="idl">Region</code></dfn>
1216+
The {{Region}}
12181217
interface is a
12191218
<a href="http://www.w3.org/TR/WebIDL/#idl-implements-statements">supplemental interface</a>
12201219
which must be implemented by all objects
@@ -1338,7 +1337,7 @@ <h3 id="the-region-interface">
13381337
if the 'flow-from' property
13391338
on the corresponding pseudo-element,
13401339
element or other construct
1341-
becomes ''none''
1340+
becomes ''flow-from/none''
13421341
but a script is still holding
13431342
a reference to the <a idl>Region</a> object.
13441343

@@ -1661,7 +1660,7 @@ <h3 id="regions-flow-content-box">
16611660

16621661
The <span>RFCB</span> is a
16631662
<a href="http://www.w3.org/TR/CSS21/visuren.html#block-boxes">block container box</a>
1664-
with a computed 'width' of ''auto'' and whose used 'height' is resolved as detailed below.
1663+
with a computed 'width' of ''width/auto'' and whose used 'height' is resolved as detailed below.
16651664

16661665
Since the <span>RFCB</span> is a <a href="http://www.w3.org/TR/CSS21/visuren.html#block-boxes">block container box</a>, the ::before box and ::after box will also be block containers, though the contents of ::before and ::after may be inline within those boxes.
16671666

@@ -1923,15 +1922,15 @@ <h4 id="step1-phase1-example">
19231922
Step 1 - Phase 1: Laying out RFCBs with used height of zero</h4>
19241923

19251924
Applying the rules for Step 1, Phase 1,
1926-
the computed ''auto'' 'width' values for the RFCBs are resolved
1925+
the computed ''width/auto'' 'width' values for the RFCBs are resolved
19271926
to used values according to the normal
19281927
<a href="http://www.w3.org/TR/CSS2/visudet.html#Computing_widths_and_margins">CSS layout rules</a>
19291928
meaning they stretch to the width
19301929
of their containing block's content box.
19311930

19321931
<ol>
19331932
<li>RFCB-A: stretches to fit the rA content box.
1934-
<p>Since rA also has an ''auto'' 'width', its own used 'width' is stretched to fit the
1933+
<p>Since rA also has an ''width/auto'' 'width', its own used 'width' is stretched to fit the
19351934
<code>&lt;body&gt;</code> content box.</p>
19361935
</li>
19371936
<li>RFCB-B: stretches to fit the <code>rB</code> content box.</li>
@@ -1959,7 +1958,7 @@ <h4 id="step1-phase2-example">
19591958

19601959
The user agent lays out as much
19611960
of the flow into an area with RFCB-A's used 'width'.
1962-
rA's 'height' computes to ''auto''
1961+
rA's 'height' computes to ''width/auto''
19631962
and there is no vertical maximum height for RFCA's 'height'.
19641963
However, because there is a break after the first paragraph
19651964
in the "article" <code>named flow</code>,

0 commit comments

Comments
 (0)