Skip to content

Commit 62a2646

Browse files
committed
markup tweak
1 parent b174790 commit 62a2646

2 files changed

Lines changed: 84 additions & 84 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 57 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -963,19 +963,21 @@ <h3 id=flex-wrap><span class=secno>6.2. </span> Flexbox Wrapping: the
963963
href="#cross-start"><i>cross-start</i></a> direction is equivalent to
964964
either the "start" or "before" direction of the current <a
965965
href="http://dev.w3.org/csswg/css3-writing-modes/#writing-mode">writing
966-
mode</a>, whichever is in the <i>cross-axis</i>, and the <a
967-
href="#cross-end"><i>cross-end</i></a> direction is the opposite
968-
direction of <a href="#cross-start"><i>cross-start</i></a>.
966+
mode</a>, whichever is in the <a href="#cross-axis"><i>cross
967+
axis</i></a>, and the <a href="#cross-end"><i>cross-end</i></a> direction
968+
is the opposite direction of <a
969+
href="#cross-start"><i>cross-start</i></a>.
969970

970971
<dt><dfn id=flex-flow-wrap>wrap</dfn>
971972

972973
<dd>The flexbox is <a href="#multi-line0"><i>multi-line</i></a>. The <a
973974
href="#cross-start"><i>cross-start</i></a> direction is equivalent to
974975
either the "start" or "before" direction of the current <a
975976
href="http://dev.w3.org/csswg/css3-writing-modes/#writing-mode">writing
976-
mode</a>, whichever is in the <i>cross-axis</i>, and the <a
977-
href="#cross-end"><i>cross-end</i></a> direction is the opposite
978-
direction of <a href="#cross-start"><i>cross-start</i></a>.
977+
mode</a>, whichever is in the <a href="#cross-axis"><i>cross
978+
axis</i></a>, and the <a href="#cross-end"><i>cross-end</i></a> direction
979+
is the opposite direction of <a
980+
href="#cross-start"><i>cross-start</i></a>.
979981

980982
<dt><dfn id=flex-flow-wrap-reverse>wrap-reverse</dfn>
981983

@@ -2037,21 +2039,22 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
20372039
<p> To lay out a flexbox and its contents, follow these steps:
20382040

20392041
<ol>
2040-
<li value=0> Generate anonymous flexbox items around runs of contiguous
2041-
inline content in the flexbox, as described in the <a
2042+
<li value=0> <strong>Generate anonymous flexbox items</strong> around runs
2043+
of contiguous inline content in the flexbox, as described in the <a
20422044
href="#flex-items">Flexbox Items</a> section.
20432045

2044-
<li> Re-order the flexbox items according to their &lsquo;<a
2045-
href="#flex-order0"><code class=property>flex-order</code></a>&rsquo;.
2046-
The items with the lowest (most negative) &lsquo;<a
2047-
href="#flex-order0"><code class=property>flex-order</code></a>&rsquo;
2048-
values are first in the ordering. If multiple items share a &lsquo;<a
2049-
href="#flex-order0"><code class=property>flex-order</code></a>&rsquo;
2050-
value, they're ordered by document order. This affects the order in which
2051-
the flexbox items generate boxes in the box-tree, and how the rest of
2052-
this algorithm deals with the items.
2053-
2054-
<li> Determine the main size of the flexbox, based on its <a
2046+
<li> <strong>Re-order the flexbox items according to their &lsquo;<a
2047+
href="#flex-order0"><code
2048+
class=property>flex-order</code></a>&rsquo;.</strong> The items with the
2049+
lowest (most negative) &lsquo;<a href="#flex-order0"><code
2050+
class=property>flex-order</code></a>&rsquo; values are first in the
2051+
ordering. If multiple items share a &lsquo;<a href="#flex-order0"><code
2052+
class=property>flex-order</code></a>&rsquo; value, they're ordered by
2053+
document order. This affects the order in which the flexbox items
2054+
generate boxes in the box-tree, and how the rest of this algorithm deals
2055+
with the items.
2056+
2057+
<li> <strong>Determine the main size of the flexbox</strong> using its <a
20552058
href="#main-size-property"><i>main size property</i></a>. In this
20562059
calculation, the <i>min content main size</i> of the flexbox is the
20572060
maximum of the flexbox's items' <i>min-content size contributions</i>,
@@ -2062,7 +2065,7 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
20622065
the preferred size is used in place of the <a
20632066
href="#main-size-property"><i>main size property</i></a>.
20642067

2065-
<li> Determine the hypothetical main size of each item.
2068+
<li> <strong>Determine the hypothetical main size of each item:</strong>
20662069
<ul>
20672070
<li> If the flexbox's main axis is parallel to the item's inline axis,
20682071
the hypothetical size is the item's preferred size, treating
@@ -2081,7 +2084,7 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
20812084
size of flexible lengths &mdash; those constraints are handled elsewhere
20822085
in this algorithm, and doing so will produce incorrect results.</em>
20832086

2084-
<li> Collect flexbox items into flexbox lines:
2087+
<li> <strong>Collect flexbox items into flexbox lines:</strong>
20852088
<ul>
20862089
<li> If the flexbox is single-line, collect all the flexbox items into a
20872090
single flexbox line.
@@ -2099,11 +2102,13 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
20992102
Or are they really shrink-wrap, such that we need to adjust the main
21002103
size here, now that we know the length of the longest line?
21012104

2102-
<li> <a href="#resolve-flexible-lengths">Resolve the flexible lengths</a>
2103-
of all the flexbox items to find their used main size. Determine their
2104-
hypothetical cross size from this main size.
2105+
<li> <strong><a href="#resolve-flexible-lengths">Resolve the flexible
2106+
lengths</a></strong> of all the flexbox items to find their used main
2107+
size, and <strong>determine their hypothetical cross size</strong> from
2108+
this main size.
21052109

2106-
<li> Distribute any remaining free space. For each flexbox line:
2110+
<li> <strong>Distribute any remaining free space.</strong> For each
2111+
flexbox line:
21072112
<ol>
21082113
<li> If the remaining free space is positive and at least one main-axis
21092114
margin on this line is &lsquo;<code class=css>auto</code>&rsquo;,
@@ -2114,8 +2119,8 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
21142119
href="#flex-pack0"><code class=property>flex-pack</code></a>&rsquo;.
21152120
</ol>
21162121

2117-
<li> Calculate the cross size of each flexbox line. For each flexbox line:
2118-
2122+
<li> <strong>Calculate the cross size of each flexbox line.</strong> For
2123+
each flexbox line:
21192124
<ol>
21202125
<li> Collect all the flexbox items whose inline axis is parallel to the
21212126
main axis and whose &lsquo;<a href="#flex-item-align"><code
@@ -2142,36 +2147,35 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
21422147
cross size of each flexbox line by equal amounts such that the sum of
21432148
their cross sizes exactly equals the flexbox's inner cross size.
21442149

2145-
<li> Resolve cross axis &lsquo;<code class=css>auto</code>&rsquo; margins.
2146-
If a flexbox item has &lsquo;<code class=css>auto</code>&rsquo; cross
2147-
axis margins, and its outer cross size (treating those &lsquo;<code
2148-
class=css>auto</code>&rsquo; margins as zero) is less than the cross size
2149-
of its flexbox line, distribute the difference in those sizes equally to
2150-
the &lsquo;<code class=css>auto</code>&rsquo; margins.
2151-
2152-
<li> Determine the used cross size of each flexbox item.
2153-
<p> If a flexbox item has &lsquo;<code class=css>flex-item-align:
2154-
stretch</code>&rsquo; and its cross size property is &lsquo;<code
2155-
class=css>auto</code>&rsquo;, the used outer cross size is the cross
2156-
size of its flexbox line, clamped by its min and max cross size
2157-
properties.
2158-
2159-
<p> Otherwise, the used cross size is the item's hypothetical cross size.
2160-
2161-
2162-
<li> Align all flexbox items along the cross axis per &lsquo;<a
2163-
href="#flex-item-align"><code
2150+
<li> <strong>Resolve cross axis &lsquo;<code class=css>auto</code>&rsquo;
2151+
margins.</strong> If a flexbox item has &lsquo;<code
2152+
class=css>auto</code>&rsquo; cross axis margins, and its outer cross size
2153+
(treating those &lsquo;<code class=css>auto</code>&rsquo; margins as
2154+
zero) is less than the cross size of its flexbox line, distribute the
2155+
difference in those sizes equally to the &lsquo;<code
2156+
class=css>auto</code>&rsquo; margins.
2157+
2158+
<li> <strong>Determine the used cross size of each flexbox item.</strong>
2159+
If a flexbox item has &lsquo;<code class=css>flex-item-align:
2160+
stretch</code>&rsquo; and its cross size property is &lsquo;<code
2161+
class=css>auto</code>&rsquo;, the used outer cross size is the cross size
2162+
of its flexbox line, clamped by its min and max cross size properties.
2163+
Otherwise, the used cross size is the item's hypothetical cross size.
2164+
2165+
<li> <strong>Align all flexbox items along the cross axis</strong> per
2166+
&lsquo;<a href="#flex-item-align"><code
21642167
class=property>flex-item-align</code></a>&rsquo;.
21652168

2166-
<li> Determine the flexbox's used cross size.
2169+
<li> <strong>Determine the flexbox's used cross size:</strong>
21672170
<ul>
21682171
<li> If the cross size property is a <a
21692172
href="#definite0"><i>definite</i></a> size, use that.
21702173

21712174
<li> Otherwise, use the sum of the flexbox lines' cross sizes.
21722175
</ul>
21732176

2174-
<li> Align all flexbox lines per &lsquo;<a href="#flex-line-pack0"><code
2177+
<li> <strong>Align all flexbox lines</strong> per &lsquo;<a
2178+
href="#flex-line-pack0"><code
21752179
class=property>flex-line-pack</code></a>&rsquo;.
21762180
</ol>
21772181

@@ -2397,15 +2401,15 @@ <h2 id=pagination><span class=secno>10. </span> Page breaks in flexbox</h2>
23972401
needed.
23982402

23992403
<li>Items that fit completely or partially on current page are aligned
2400-
on cross-axis:
2404+
on cross axis:
24012405
<ol>
2402-
<li>For the purposes of cross-axis alignment, minimum of remaining
2406+
<li>For the purposes of cross axis alignment, minimum of remaining
24032407
available space in flexbox and available space at current page is
24042408
used.
24052409

24062410
<li>If an item is broken in the previous step and its alignment is not
2407-
baseline, its cross-axis margin-box size is set to available space.
2408-
If item alignment is baseline, its cross-axis size is adjusted so
2411+
baseline, its cross axis margin-box size is set to available space.
2412+
If item alignment is baseline, its cross axis size is adjusted so
24092413
that it extends to exactly the end of available space.
24102414
</ol>
24112415
</ol>
@@ -2439,7 +2443,7 @@ <h2 id=pagination><span class=secno>10. </span> Page breaks in flexbox</h2>
24392443

24402444
<li>Breaks inside items (forced or unforced) are not allowed.
24412445

2442-
<li>If the first flexbox line on a page doesn't fit in cross-axis,
2446+
<li>If the first flexbox line on a page doesn't fit in cross axis,
24432447
<ol>
24442448
<li>If the flexbox is not at the top of the page, it is moved to the
24452449
next page.

css3-flexbox/Overview.src.html

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -434,11 +434,11 @@ <h3 id='flex-wrap'>
434434

435435
<dl>
436436
<dt>nowrap</dt>
437-
<dd>The flexbox is <i>single-line</i>. The <i>cross-start</i> direction is equivalent to either the "start" or "before" direction of the current <a href="http://dev.w3.org/csswg/css3-writing-modes/#writing-mode">writing mode</a>, whichever is in the <i>cross-axis</i>, and the <i>cross-end</i> direction is the opposite direction of <i>cross-start</i>.
437+
<dd>The flexbox is <i>single-line</i>. The <i>cross-start</i> direction is equivalent to either the "start" or "before" direction of the current <a href="http://dev.w3.org/csswg/css3-writing-modes/#writing-mode">writing mode</a>, whichever is in the <i>cross axis</i>, and the <i>cross-end</i> direction is the opposite direction of <i>cross-start</i>.
438438
</dd>
439439

440440
<dt><dfn id='flex-flow-wrap'>wrap</dfn></dt>
441-
<dd>The flexbox is <i>multi-line</i>. The <i>cross-start</i> direction is equivalent to either the "start" or "before" direction of the current <a href="http://dev.w3.org/csswg/css3-writing-modes/#writing-mode">writing mode</a>, whichever is in the <i>cross-axis</i>, and the <i>cross-end</i> direction is the opposite direction of <i>cross-start</i>.</dd>
441+
<dd>The flexbox is <i>multi-line</i>. The <i>cross-start</i> direction is equivalent to either the "start" or "before" direction of the current <a href="http://dev.w3.org/csswg/css3-writing-modes/#writing-mode">writing mode</a>, whichever is in the <i>cross axis</i>, and the <i>cross-end</i> direction is the opposite direction of <i>cross-start</i>.</dd>
442442

443443
<dt><dfn id='flex-flow-wrap-reverse'>wrap-reverse</dfn></dt>
444444
<dd>Same as <i>wrap</i>, except the <i>cross-start</i> and <i>cross-end</i> directions are swapped.</dd>
@@ -1064,19 +1064,19 @@ <h2 id='layout-algorithm'>
10641064

10651065
<ol>
10661066
<li value=0>
1067-
Generate anonymous flexbox items around runs of contiguous inline content in the flexbox,
1067+
<strong>Generate anonymous flexbox items</strong> around runs of contiguous inline content in the flexbox,
10681068
as described in the <a href="#flex-items">Flexbox Items</a> section.
10691069

10701070
<li>
1071-
Re-order the flexbox items according to their 'flex-order'.
1071+
<strong>Re-order the flexbox items according to their 'flex-order'.</strong>
10721072
The items with the lowest (most negative) 'flex-order' values are first in the ordering.
10731073
If multiple items share a 'flex-order' value,
10741074
they're ordered by document order.
10751075
This affects the order in which the flexbox items generate boxes in the box-tree,
10761076
and how the rest of this algorithm deals with the items.
10771077

10781078
<li>
1079-
Determine the main size of the flexbox, based on its <i>main size property</i>.
1079+
<strong>Determine the main size of the flexbox</strong> using its <i>main size property</i>.
10801080
In this calculation, the <i>min content main size</i> of the flexbox
10811081
is the maximum of the flexbox's items' <i>min-content size contributions</i>,
10821082
and the <i>max content main size</i> of the flexbox
@@ -1085,7 +1085,7 @@ <h2 id='layout-algorithm'>
10851085
and for flexbox items the preferred size is used in place of the <i>main size property</i>.
10861086

10871087
<li>
1088-
Determine the hypothetical main size of each item.
1088+
<strong>Determine the hypothetical main size of each item:</strong>
10891089

10901090
<ul>
10911091
<li>
@@ -1109,7 +1109,7 @@ <h2 id='layout-algorithm'>
11091109
those constraints are handled elsewhere in this algorithm, and doing so will produce incorrect results.</em>
11101110

11111111
<li>
1112-
Collect flexbox items into flexbox lines:
1112+
<strong>Collect flexbox items into flexbox lines:</strong>
11131113

11141114
<ul>
11151115
<li>
@@ -1134,11 +1134,11 @@ <h2 id='layout-algorithm'>
11341134
Or are they really shrink-wrap, such that we need to adjust the main size here, now that we know the length of the longest line?
11351135

11361136
<li>
1137-
<a href='#resolve-flexible-lengths'>Resolve the flexible lengths</a> of all the flexbox items to find their used main size.
1138-
Determine their hypothetical cross size from this main size.
1137+
<strong><a href='#resolve-flexible-lengths'>Resolve the flexible lengths</a></strong> of all the flexbox items to find their used main size,
1138+
and <strong>determine their hypothetical cross size</strong> from this main size.
11391139

11401140
<li>
1141-
Distribute any remaining free space.
1141+
<strong>Distribute any remaining free space.</strong>
11421142
For each flexbox line:
11431143

11441144
<ol>
@@ -1153,7 +1153,7 @@ <h2 id='layout-algorithm'>
11531153
</ol>
11541154

11551155
<li>
1156-
Calculate the cross size of each flexbox line.
1156+
<strong>Calculate the cross size of each flexbox line.</strong>
11571157
For each flexbox line:
11581158

11591159
<ol>
@@ -1180,7 +1180,7 @@ <h2 id='layout-algorithm'>
11801180
such that the sum of their cross sizes exactly equals the flexbox's inner cross size.
11811181

11821182
<li>
1183-
Resolve cross axis ''auto'' margins.
1183+
<strong>Resolve cross axis ''auto'' margins.</strong>
11841184
If a flexbox item has ''auto'' cross axis margins,
11851185
and its outer cross size
11861186
(treating those ''auto'' margins as zero)
@@ -1189,23 +1189,19 @@ <h2 id='layout-algorithm'>
11891189
to the ''auto'' margins.
11901190

11911191
<li>
1192-
Determine the used cross size of each flexbox item.
1193-
1194-
<p>
1195-
If a flexbox item has ''flex-item-align: stretch''
1196-
and its cross size property is ''auto'',
1197-
the used outer cross size is the cross size of its flexbox line,
1198-
clamped by its min and max cross size properties.
1199-
1200-
<p>
1201-
Otherwise,
1202-
the used cross size is the item's hypothetical cross size.
1192+
<strong>Determine the used cross size of each flexbox item.</strong>
1193+
If a flexbox item has ''flex-item-align: stretch''
1194+
and its cross size property is ''auto'',
1195+
the used outer cross size is the cross size of its flexbox line,
1196+
clamped by its min and max cross size properties.
1197+
Otherwise,
1198+
the used cross size is the item's hypothetical cross size.
12031199

12041200
<li>
1205-
Align all flexbox items along the cross axis per 'flex-item-align'.
1201+
<strong>Align all flexbox items along the cross axis</strong> per 'flex-item-align'.
12061202

12071203
<li>
1208-
Determine the flexbox's used cross size.
1204+
<strong>Determine the flexbox's used cross size:</strong>
12091205

12101206
<ul>
12111207
<li>
@@ -1218,7 +1214,7 @@ <h2 id='layout-algorithm'>
12181214
</ul>
12191215

12201216
<li>
1221-
Align all flexbox lines per 'flex-line-pack'.
1217+
<strong>Align all flexbox lines</strong> per 'flex-line-pack'.
12221218
</ol>
12231219

12241220
<h3 id='resolve-flexible-lengths'>
@@ -1414,13 +1410,13 @@ <h2 id="pagination">
14141410

14151411
<li>Items that have fit completely on a previous page and items that are pushed to next page don’t have any rendering, leaving empty space as needed.</li>
14161412

1417-
<li>Items that fit completely or partially on current page are aligned on cross-axis:
1413+
<li>Items that fit completely or partially on current page are aligned on cross axis:
14181414

14191415
<ol>
1420-
<li>For the purposes of cross-axis alignment, minimum of remaining available space in flexbox and available space at current page is used.</li>
1416+
<li>For the purposes of cross axis alignment, minimum of remaining available space in flexbox and available space at current page is used.</li>
14211417

1422-
<li>If an item is broken in the previous step and its alignment is not baseline, its cross-axis
1423-
margin-box size is set to available space. If item alignment is baseline, its cross-axis size is adjusted so that it extends to exactly the end of available space.</li>
1418+
<li>If an item is broken in the previous step and its alignment is not baseline, its cross axis
1419+
margin-box size is set to available space. If item alignment is baseline, its cross axis size is adjusted so that it extends to exactly the end of available space.</li>
14241420
</ol>
14251421
</li>
14261422
</ol>
@@ -1447,7 +1443,7 @@ <h2 id="pagination">
14471443

14481444
<li>Breaks inside items (forced or unforced) are not allowed.</li>
14491445
<li>If the first flexbox line on a page doesn't fit in
1450-
cross-axis,
1446+
cross axis,
14511447
<ol>
14521448
<li>If the flexbox is not at the top of the page, it is moved to the next page.</li>
14531449
<li>If the flexbox is already at the top of the page, the item may produce overflow. If 'overflow' property of the flexbox is set to 'visible', it is paginated using same rules as visible overflow of blocks in normal flow.</li>

0 commit comments

Comments
 (0)