Skip to content

Commit 69e8c30

Browse files
committed
[css-flexbox] Some shuffling of <dfn>s.
--HG-- extra : rebase_source : 6860871968cfce17224bb0c89f7ae138f89a3930
1 parent cdc43a0 commit 69e8c30

2 files changed

Lines changed: 10 additions & 3104 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,10 @@ Values</h3>
403403
Flex Layout Box Model and Terminology</h2>
404404

405405
<p>
406-
A box with ''display:flex'' or ''display:inline-flex'' is a <i>flex container</i>.
407-
Children of a flex container are called <i>flex items</i> and are laid out using the flex layout model.
406+
A <dfn export>flex container</dfn> is the box generated by an element with a
407+
computed 'display' of 'flex' or 'inline-flex'.
408+
In-flow children of a flex container are called <dfn export title="flex item" id="flex-item">flex items</dfn>
409+
and are laid out using the flex layout model.
408410

409411
<p>
410412
Unlike block and inline layout,
@@ -491,7 +493,7 @@ Flex Containers: the <a href="#display-flex">''flex''</a> and <a href="#display-
491493
</dl>
492494

493495
<p>
494-
A <dfn export>flex container</dfn> establishes a new <dfn export>flex formatting context</dfn> for its contents.
496+
A <i>flex container</i> establishes a new <dfn export>flex formatting context</dfn> for its contents.
495497
This is the same as establishing a block formatting context,
496498
except that flex layout is used instead of block layout:
497499
floats do not intrude into the flex container,
@@ -511,9 +513,10 @@ Flex Containers: the <a href="#display-flex">''flex''</a> and <a href="#display-
511513
all of the 'column-*' properties in the Multicol module have no effect on a flex container.
512514

513515
<li>
514-
'float' and 'clear' have no effect on a <i>flex item</i>.
515-
(However, the 'float' property still affects the computed value of 'display' on children of a flex container,
516-
as this occurs <em>before</em> <i>flex items</i> are determined.)
516+
'float' and 'clear' have no effect on a <i>flex item</i>,
517+
and do not take it out-of-flow.
518+
However, the 'float' property can still affect box generation
519+
by influencing the 'display' property's computed value.
517520

518521
<li>
519522
'vertical-align' has no effect on a flex item.
@@ -535,7 +538,7 @@ Flex Containers: the <a href="#display-flex">''flex''</a> and <a href="#display-
535538
Flex Items</h2>
536539

537540
<p>
538-
The contents of a <i>flex container</i> consists of zero or more <dfn export title="flex item" id="flex-item">flex items</dfn>:
541+
The contents of a <i>flex container</i> consists of zero or more <i>flex items</i>:
539542
each in-flow child of a <i>flex container</i>
540543
becomes a <i>flex item</i>,
541544
and each contiguous run of text that is directly contained inside a <i>flex container</i>

0 commit comments

Comments
 (0)