Skip to content

Commit 99afaee

Browse files
committed
Add 'flex-line-pack:stretch', per mailing list.
1 parent 1a27a64 commit 99afaee

2 files changed

Lines changed: 19 additions & 7 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
<h1 id=head-box-flexible>CSS Flexible Box Layout Module</h1>
3131

32-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 27 January 2012</h2>
32+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 30 January 2012</h2>
3333

3434
<dl>
3535
<dt>This version:
36-
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120127/">http://www.w3.org/TR/2012/ED-css3-flexbox-20120127/</a>-->
36+
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120130/">http://www.w3.org/TR/2012/ED-css3-flexbox-20120130/</a>-->
3737

3838

3939
<dd><a
@@ -1644,7 +1644,7 @@ <h3 id=flex-line-pack><span class=secno>6.1. </span> &lsquo;<a
16441644
<tr>
16451645
<th><a href="http://dev.w3.org/csswg/css-module/#values">Value</a>:
16461646

1647-
<td>start | end | center | justify
1647+
<td>start | end | center | justify | stretch
16481648

16491649
<tr>
16501650
<th>Initial:
@@ -1726,6 +1726,14 @@ <h3 id=flex-line-pack><span class=secno>6.1. </span> &lsquo;<a
17261726
href="#cross-end"><i>cross-end</i></a> content edge of the flexbox, and
17271727
the remaining lines in the flexbox are distributed so that the empty
17281728
space between any two adjacent lines is the same.
1729+
1730+
<dt><dfn id=flex-line-pack-stretch>stretch</dfn>
1731+
1732+
<dd>Lines stretch to take up the remaining space. If the leftover
1733+
free-space is negative, this value is identical to &lsquo;<a
1734+
href="#flex-line-pack-start"><code class=css>start</code></a>&rsquo;.
1735+
Otherwise, the free-space is split equally between all of the lines,
1736+
increasing their cross size.
17291737
</dl>
17301738

17311739
<p class=note>Note: Only <a href="#multi-line0"><i>multi-line</i></a>
@@ -1913,7 +1921,7 @@ <h2 id=layout-algorithm><span class=secno>7. </span> Flexbox Layout
19131921
&lsquo;<a href="#flex-line-pack-end"><code
19141922
class=css>end</code></a>&rsquo;, &lsquo;<a
19151923
href="#flex-line-pack-center"><code class=css>center</code></a>&rsquo;,
1916-
or &lsquo;<a href="#flex-align-stretch"><code
1924+
or &lsquo;<a href="#flex-line-pack-stretch"><code
19171925
class=css>stretch</code></a>&rsquo;, or a value of &lsquo;<a
19181926
href="#flex-align-baseline"><code class=css>baseline</code></a>&rsquo;
19191927
and a cross axis parallel to their inline axis, and find the maximum of
@@ -2407,7 +2415,7 @@ <h2 class=no-num id=property>Property index</h2>
24072415
<tr>
24082416
<th><a class=property href="#flex-line-pack0">flex-line-pack</a>
24092417

2410-
<td>start | end | center | justify
2418+
<td>start | end | center | justify | stretch
24112419

24122420
<td>start
24132421

@@ -2633,7 +2641,8 @@ <h2 class=no-num id=index>Index</h2>
26332641
title=start><strong>5.1.</strong></a>
26342642

26352643
<li>stretch, <a href="#flex-align-stretch"
2636-
title=stretch><strong>5.2.</strong></a>
2644+
title=stretch><strong>5.2.</strong></a>, <a
2645+
href="#flex-line-pack-stretch" title=stretch><strong>6.1.</strong></a>
26372646

26382647
<li>style sheet
26392648
<ul>

css3-flexbox/Overview.src.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ <h3 id='flex-line-pack'>
798798
<td><dfn>flex-line-pack</dfn>
799799
<tr>
800800
<th><a href="http://dev.w3.org/csswg/css-module/#values">Value</a>:
801-
<td>start | end | center | justify
801+
<td>start | end | center | justify | stretch
802802
<tr>
803803
<th>Initial:
804804
<td>start
@@ -833,6 +833,9 @@ <h3 id='flex-line-pack'>
833833

834834
<dt><dfn id='flex-line-pack-justify'>justify</dfn></dt>
835835
<dd>Lines are evenly distributed in the flexbox. If the leftover free-space is negative or there is only a single line in the flexbox, this value is identical to ''start''. Otherwise, the <i>cross-start</i> edge of the first line in the flexbox is placed flush with the <i>cross-start</i> content edge of the flexbox, the <i>cross-end</i> edge of the last line in the flexbox is placed flush with the <i>cross-end</i> content edge of the flexbox, and the remaining lines in the flexbox are distributed so that the empty space between any two adjacent lines is the same.</dd>
836+
837+
<dt><dfn id='flex-line-pack-stretch'>stretch</dfn></dt>
838+
<dd>Lines stretch to take up the remaining space. If the leftover free-space is negative, this value is identical to ''start''. Otherwise, the free-space is split equally between all of the lines, increasing their cross size.
836839
</dl>
837840

838841
<p class='note'>Note: Only <i>multi-line</i> flexboxes ever have free space in the <i>cross axis</i> for lines to be aligned in, because in a <i>single-line</i> flexbox the sole line automatically stretches to fill the space.</p>

0 commit comments

Comments
 (0)