Skip to content

Commit a13dc6a

Browse files
committed
[css-flexbox] Clarify that it's adjusting the used main size.
1 parent 14397dd commit a13dc6a

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

css-flexbox/Overview.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
list-style: none;
4646
}
4747
</style>
48+
49+
<script defer src=//test.csswg.org/harness/annotate.js#css-flexbox-1_dev type=text/javascript></script>
4850
<style>
4951
code.one-line { white-space: pre; }
5052
.code-and-figure {
@@ -244,7 +246,7 @@
244246
</p>
245247
<h1 class="p-name no-ref" id=title>CSS Flexible Box Layout Module Level 1</h1>
246248
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
247-
<span class=dt-updated><span class=value-title title=20140130>30 January 2014</span></span></span></h2>
249+
<span class=dt-updated><span class=value-title title=20140205>5 February 2014</span></span></span></h2>
248250
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-flexbox/>http://dev.w3.org/csswg/css-flexbox/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css3-flexbox/>http://www.w3.org/TR/css3-flexbox/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-flexbox/>http://dev.w3.org/csswg/css-flexbox/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/ rel=previous>http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-flexbox-20120612/ rel=previous>http://www.w3.org/TR/2012/WD-css3-flexbox-20120612/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-flexbox-20120322/ rel=previous>http://www.w3.org/TR/2012/WD-css3-flexbox-20120322/</a><dd><a href=http://www.w3.org/TR/2011/WD-css3-flexbox-20111129/ rel=previous>http://www.w3.org/TR/2011/WD-css3-flexbox-20111129/</a><dd><a href=http://www.w3.org/TR/2011/WD-css3-flexbox-20110322/ rel=previous>http://www.w3.org/TR/2011/WD-css3-flexbox-20110322/</a><dd><a href=http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/ rel=previous>http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/</a>
249251
<dt>Feedback:</dt>
250252
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-flexbox%5D%20feedback">www-style@w3.org</a>
@@ -631,7 +633,7 @@ <h2 class="heading settled heading" data-level=3 id=flex-containers><span class=
631633
and the flex container’s margins do not collapse with the margins of its contents.
632634
<a data-link-type=dfn href=#flex-container title="flex containers">Flex containers</a> form a containing block for their contents
633635
<a href=http://www.w3.org/TR/CSS21/visudet.html#containing-block-details>exactly like block containers do</a>. <a data-biblio-type=normative data-link-type=biblio href=#css21 title=css21>[CSS21]</a>
634-
The <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> property applies to <a data-link-type=dfn href=#flex-container title="flex containers">flex containers</a>.
636+
The <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> property applies to <a data-link-type=dfn href=#flex-container title="flex containers">flex containers</a>.
635637

636638

637639
<p>
@@ -1924,7 +1926,7 @@ <h3 class="heading settled heading" data-level=8.5 id=flex-baselines><span class
19241926

19251927
<p>
19261928
When calculating the baseline according to the above rules,
1927-
if the box contributing a baseline has an <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> value that allows scrolling,
1929+
if the box contributing a baseline has an <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> value that allows scrolling,
19281930
the box must be treated as being in its initial scroll position
19291931
for the purpose of determining its baseline.
19301932

@@ -1949,7 +1951,7 @@ <h3 class="heading settled heading" data-level=8.5 id=flex-baselines><span class
19491951
If there is no such line box or child,
19501952
then the block has no baseline.
19511953
For the purposes of finding a baseline,
1952-
in-flow boxes with a scrolling mechanisms (see the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> property)
1954+
in-flow boxes with a scrolling mechanisms (see the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> property)
19531955
must be considered as if scrolled to their origin position.
19541956

19551957
<p>
@@ -2376,7 +2378,8 @@ <h3 class="heading settled heading" data-level=9.7 id=resolve-flexible-lengths><
23762378

23772379
<li>
23782380
<strong>Adjust main size.</strong>
2379-
Add each item’s <var>desired free space</var> to its <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a>.
2381+
Set each item’s used main size
2382+
to its <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> plus its <var>desired free space</var>.
23802383

23812384
<p class=note> Note: This may result in a negative main size temporarily.
23822385

@@ -2810,7 +2813,7 @@ <h2 class="no-num heading settled heading" id=changes><span class=content>Change
28102813
<li>
28112814
Clarified that table anonymous box generation occurs in place of computed value conversion for internal table elements.
28122815
<li>
2813-
Clarified that <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> applies to flex containers.
2816+
Clarified that <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> applies to flex containers.
28142817
<li>
28152818
Clarified that <span class=css data-link-type=maybe title=::first-line>::first-line</span> and <span class=css data-link-type=maybe title=::first-letter>::first-letter</span> pseudo-elements do not apply to flex containers (because they are not block containers).
28162819
<li>

css-flexbox/Overview.src.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2365,7 +2365,8 @@ <h3 id='resolve-flexible-lengths'>
23652365

23662366
<li>
23672367
<strong>Adjust main size.</strong>
2368-
Add each item's <var>desired free space</var> to its <a>flex base size</a>.
2368+
Set each item's used main size
2369+
to its <a>flex base size</a> plus its <var>desired free space</var>.
23692370

23702371
Note: This may result in a negative main size temporarily.
23712372

0 commit comments

Comments
 (0)