8000 merge · w3c/csswg-drafts@7d1be30 · GitHub < 8000 meta property="og:site_name" content="GitHub" />
Skip to content

Commit 7d1be30

Browse files
author
Peter Linss
committed
merge
2 parents 733983d + 7d6bab9 commit 7d1be30

5 files changed

Lines changed: 127 additions & 6316 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,8 @@ Implied Minimum Size of Flex Items</h3>
932932
<dl>
933933
<dt><var>clamped size</var>
934934
<dd>
935-
If the item’s computed 'flex-basis' is ''auto''
935+
If the item’s computed 'flex-basis' is <a>definite</a>,
936+
or the item’s computed 'flex-basis' is ''content''
936937
and its computed <a>main size property</a> is <a>definite</a>,
937938
then the <var>clamped size</var> is that size
938939
(clamped by its <a>max main size property</a> if it's <a>definite</a>).
@@ -2370,9 +2371,12 @@ Line Length Determination</h3>
23702371
and the <a>flex item</a>’s cross size is ''auto'' and not <a>definite</a>,
23712372
in this calculation use ''width/fit-content'' as the <a>flex item</a>’s <a>cross size</a>.
23722373
The <a>flex base size</a> is the item's resulting <a>main size</a>.
2373-
23742374
</ol>
23752375

2376+
When determining the <a>flex base size</a>,
2377+
the item’s min and max main size properties are ignored
2378+
(no clamping occurs).
2379+
23762380
The <a>hypothetical main size</a> is the item's <a>flex base size</a>
23772381
clamped according to its min and max main size properties.
23782382

@@ -2742,7 +2746,8 @@ Definite and Indefinite Sizes</h3>
27422746
<li>
27432747
If a percentage is going to be resolved against a <a>flex item’s</a> <a>main size</a>,
27442748
and the <a>flex item</a> has a <a>definite</a> <a>flex basis</a>,
2745-
the <a>main size</a> must be treated as <a>definite</a>
2749+
and the <a>flex container</a> has a <a>definite</a> <a>main size</a>,
2750+
the <a>flex item’s</a> <a>main size</a> must be treated as <a>definite</a>
27462751
for the purpose of resolving the percentage,
27472752
and the percentage must resolve against the <strong>flexed</strong> <a>main size</a> of the <a>flex item</a>
27482753
(that is, after the layout algorithm below has been completed for the <a>flex item’s</a> <a>flex container</a>,
@@ -3267,17 +3272,40 @@ Substantive Changes and Bugfixes</h4>
32673272
and <ins>n</ins>either of the <a>cross-axis</a> margins are ''margin/auto'',
32683273
the <a>flex item</a> is <a>stretched</a>.
32693274
</blockquote>
3275+
3276+
<li id="change-201409-flexed-definite-container">
3277+
Specify that the <a>flex container</a>’s <a>main size</a> must also be <a>definite</a>
3278+
for a flex item’s flexed main size to be <a>definite</a>.
3279+
(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140925#issue-20">20</a>)
3280+
3281+
<blockquote>
3282+
<p>[If] ... the <a>flex item</a> has a <a>definite</a> <a>flex basis</a>,
3283+
<ins>and the <a>flex container</a> has a <a>definite</a> <a>main size</a>,</ins>
3284+
the <a>flex item’s</a> <a>main size</a> must be treated as <a>definite</a> ...
3285+
</blockquote>
32703286
</ul>
32713287

32723288
<h4 id="change-201409-clarify">
32733289
Clarifications</h4>
32743290

32753291
<ul>
3292+
<li id="change-201409-unclamped-size">
3293+
Clarify that <a>flex base size</a> is unclamped.
3294+
(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140925#issue-21">21</a>)
3295+
3296+
<blockquote>
3297+
<p><ins>When determining the <a>flex base size</a>,
3298+
the item’s min and max main size properties are ignored
3299+
(no clamping occurs).</ins>
3300+
<p>Th 7B40 e <a>hypothetical main size</a> is the item's <a>flex base size</a>
3301+
clamped according to its min and max main size properties.
3302+
</blockquote>
3303+
32763304
<li id="change-201409-table-wrappers">
32773305
Restored normative status of note about table wrapper boxes normative;
32783306
it had been accidentally changed in the previous draft.
32793307
(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140925#issue-2">2</a>)
3280-
3308+
32813309
<li id="change-201409-display-longhands">
32823310
Removed references to 'display' property longhands,
32833311
since they will be removed from CSS Display Level 3.

0 commit comments

Comments
 (0)