Skip to content

Commit dfcd051

Browse files
committed
[css-flexbox] Regen
1 parent da73a91 commit dfcd051

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

css-flexbox/Overview.html

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
<div class="head">
304304
<p data-fill-with="logo"><a class="logo" href="http://www.w3.org/"> <img alt="W3C" height="48" src="https://www.w3.org/Icons/w3c_home" width="72"> </a> </p>
305305
<h1 class="p-name no-ref" id="title">CSS Flexible Box Layout Module Level 1</h1>
306-
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2015-10-26">26 October 2015</time></span></h2>
306+
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2015-11-10">10 November 2015</time></span></h2>
307307
<div data-fill-with="spec-metadata">
308308
<dl>
309309
<dt>This version:
@@ -820,7 +820,7 @@ <h3 class="heading settled" data-level="4.1" id="abspos-items"><span class="secn
820820
<h3 class="heading settled" data-level="4.2" id="item-margins"><span class="secno">4.2. </span><span class="content"> Flex Item Margins and Paddings</span><a class="self-link" href="#item-margins"></a></h3>
821821
<p>The margins of adjacent <a data-link-type="dfn" href="#flex-item">flex items</a> do not <a href="http://www.w3.org/TR/CSS2/box.html#collapsing-margins">collapse</a>.</p>
822822
<p>Percentage margins and paddings on <a data-link-type="dfn" href="#flex-item">flex items</a> are always resolved against their own axis:
823-
left and right margins resolve against the containing’s block width,
823+
left and right margins resolve against the containing block’s width,
824824
and top and bottom margins resolve against the containing block’s height.
825825
Unlike blocks, <a data-link-type="dfn" href="https://drafts.csswg.org/css-writing-modes-3/#block-axis">block-axis</a> margins do not resolve against
826826
the inline dimension of their containing block.</p>
@@ -1745,8 +1745,8 @@ <h3 class="heading settled" data-level="8.1" id="auto-margins"><span class="secn
17451745
the alignment properties will have no effect in that dimension
17461746
because the margins will have stolen all the free space
17471747
left over after flexing.</p>
1748-
<div class="example" id="example-c2f4f7f3">
1749-
<a class="self-link" href="#example-c2f4f7f3"></a> One use of <span class="css">auto</span> margins in the main axis is to separate flex items into distinct "groups".
1748+
<div class="example" id="example-f1650544">
1749+
<a class="self-link" href="#example-f1650544"></a> One use of <span class="css">auto</span> margins in the main axis is to separate flex items into distinct "groups".
17501750
The following example shows how to use this to reproduce a common UI pattern -
17511751
a single bar of actions with some aligned on the left and others aligned on the right.
17521752
<figure>
@@ -1761,10 +1761,6 @@ <h3 class="heading settled" data-level="8.1" id="auto-margins"><span class="secn
17611761
<pre class="lang-css highlight"><span class="nt">nav</span> <span class="o">></span> <span class="nt">ul</span> <span class="p">{</span>
17621762
<span class="k">display</span><span class="o">:</span> <span class="n">flex</span><span class="p">;</span>
17631763
<span class="p">}</span>
1764-
<span class="nt">nav</span> <span class="o">></span> <span class="nt">ul</span> <span class="o">></span> <span class="nt">li</span> <span class="p">{</span>
1765-
<span class="k">min-width</span><span class="o">:</span> <span class="n">min</span><span class="o">-</span><span class="k">content</span><span class="p">;</span>
1766-
<span class="c">/* Prevent items from getting too small for their content. */</span>
1767-
<span class="p">}</span>
17681764
<span class="nt">nav</span> <span class="o">></span> <span class="nt">ul</span> <span class="o">></span> <span class="nf">#login</span> <span class="p">{</span>
17691765
<span class="k">margin-left</span><span class="o">:</span> <span class="k">auto</span><span class="p">;</span>
17701766
<span class="p">}</span></pre>
@@ -2438,8 +2434,8 @@ <h3 class="heading settled" data-level="9.9" id="intrinsic-sizes"><span class="s
24382434
<ol>
24392435
<li> For each <a data-link-type="dfn" href="#flex-item">flex item</a>,
24402436
subtract its outer <a data-link-type="dfn" href="#flex-base-size">flex base size</a> from its <a data-link-type="dfn" href="https://drafts.csswg.org/css-sizing-3/#max-content-contribution">max-content contribution</a> size.
2441-
If that result is not zero, divide it by its <a data-link-type="dfn" href="#flex-grow-factor">flex grow factor</a> (if the result was positive)
2442-
or by its <a data-link-type="dfn" href="#scaled-flex-shrink-factor">scaled flex shrink factor</a> (if the result was negative).
2437+
If that result is not zero, divide it by (if the result was positive) its <a data-link-type="dfn" href="#flex-grow-factor">flex grow factor</a> floored at 1,
2438+
or (if the result was negative) by its <a data-link-type="dfn" href="#scaled-flex-shrink-factor">scaled flex shrink factor</a>, having floored the <a data-link-type="dfn" href="#flex-shrink-factor">flex shrink factor</a> at 1.
24432439
This is the item’s <var>max-content flex fraction</var>.
24442440
<li> Place all <a data-link-type="dfn" href="#flex-item">flex items</a> into lines of infinite length.
24452441
<li> Within each line,
@@ -4008,7 +4004,7 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
40084004
<dt id="biblio-css21"><a class="self-link" href="#biblio-css21"></a>[CSS21]
40094005
<dd>Bert Bos; et al. <a href="http://www.w3.org/TR/CSS2">Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. REC. URL: <a href="http://www.w3.org/TR/CSS2">http://www.w3.org/TR/CSS2</a>
40104006
<dt id="biblio-css3-display"><a class="self-link" href="#biblio-css3-display"></a>[CSS3-DISPLAY]
4011-
<dd>Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css-display-3/">CSS Display Module Level 3</a>. 15 October 2015. WD. URL: <a href="http://www.w3.org/TR/css-display-3/">http://www.w3.org/TR/css-display-3/</a>
4007+
<dd>Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css-display-3/">CSS Display Module Level 3</a>. 21 July 2015. WD. URL: <a href="http://www.w3.org/TR/css-display-3/">http://www.w3.org/TR/css-display-3/</a>
40124008
<dt id="biblio-css3col"><a class="self-link" href="#biblio-css3col"></a>[CSS3COL]
40134009
<dd>Håkon Wium Lie. <a href="http://www.w3.org/TR/css3-multicol">CSS Multi-column Layout Module</a>. 12 April 2011. CR. URL: <a href="http://www.w3.org/TR/css3-multicol">http://www.w3.org/TR/css3-multicol</a>
40144010
<dt id="biblio-css-align-3"><a class="self-link" href="#biblio-css-align-3"></a>[CSS-ALIGN-3]
@@ -4018,7 +4014,7 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
40184014
<dt id="biblio-css-cascade-4"><a class="self-link" href="#biblio-css-cascade-4"></a>[CSS-CASCADE-4]
40194015
<dd>Elika Etemad; Tab Atkins Jr.. <a href="http://www.w3.org/TR/css-cascade-4/">CSS Cascading and Inheritance Level 4</a>. 8 September 2015. WD. URL: <a href="http://www.w3.org/TR/css-cascade-4/">http://www.w3.org/TR/css-cascade-4/</a>
40204016
<dt id="biblio-css-display-3"><a class="self-link" href="#biblio-css-display-3"></a>[CSS-DISPLAY-3]
4021-
<dd>Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css-display-3/">CSS Display Module Level 3</a>. 15 October 2015. WD. URL: <a href="http://www.w3.org/TR/css-display-3/">http://www.w3.org/TR/css-display-3/</a>
4017+
<dd>Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css-display-3/">CSS Display Module Level 3</a>. 21 July 2015. WD. URL: <a href="http://www.w3.org/TR/css-display-3/">http://www.w3.org/TR/css-display-3/</a>
40224018
<dt id="biblio-css-images-3"><a class="self-link" href="#biblio-css-images-3"></a>[CSS-IMAGES-3]
40234019
<dd>CSS Image Values and Replaced Content Module Level 3 URL: <a href="http://www.w3.org/TR/css3-images/">http://www.w3.org/TR/css3-images/</a>
40244020
<dt id="biblio-css-overflow-3"><a class="self-link" href="#biblio-css-overflow-3"></a>[CSS-OVERFLOW-3]

0 commit comments

Comments
 (0)