Skip to content

Commit ba887a4

Browse files
committed
I forgot to make the change to how 'flex' animates some time ago, to match what Daniel Holbert suggests.
--HG-- extra : rebase_source : ffeadc2f803fc6cbb66f8c16aea627e920e64e63
1 parent 73eb06a commit ba887a4

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 6 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, 6 April 2012</h2>
32+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 17 April 2012</h2>
3333

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

3838

3939
<dd><a
@@ -1249,8 +1249,8 @@ <h2 id=flexibility><span class=secno>7. </span> Flexibility: the &lsquo;<a
12491249
the future other values may be introduced that are not applicable as
12501250
length component). If omitted, the preferred size defaults to &lsquo;<code
12511251
class=css>0px</code>&rsquo;. If the <code>&lt;preferred-size></code>
1252-
component is &lsquo;<code class=css>auto</code>&rsquo; on a <a
1253-
href="#flexbox-item"><i>flexbox item</i></a>, the <a
1252+
component is &lsquo;<code class=css>auto</code>&rsquo; on a child of a <a
1253+
href="#flexbox"><i>flexbox</i></a>, the <a
12541254
href="#preferred-size"><i>preferred size</i></a> is the <a
12551255
href="#main-size-property"><i>main size property</i></a>&apos;s value.
12561256

@@ -1264,8 +1264,8 @@ <h2 id=flexibility><span class=secno>7. </span> Flexibility: the &lsquo;<a
12641264
"0 0 auto".
12651265

12661266
<p>The &lsquo;<a href="#flex"><code class=property>flex</code></a>&rsquo;
1267-
property is transitionable if the element is a <a
1268-
href="#flexbox-item"><i>flexbox item</i></a> and the <a
1267+
property is transitionable if the element is a child of a <a
1268+
href="#flexbox"><i>flexbox</i></a> and the <a
12691269
href="#preferred-size"><i>preferred size</i></a> is transitionable, by
12701270
transitioning the <a href="#positive-flexibility"><i>positive
12711271
flexibility</i></a>, <a href="#negative-flexibility"><i>negative

css3-flexbox/Overview.src.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,13 +600,13 @@ <h2 id='flexibility'>
600600

601601
<p><code>&lt;pos-flex></code> and <code>&lt;neg-flex></code> are non-negative <code>&lt;number>s</code>. The <code>&lt;pos-flex></code> component sets the <i>positive flexibility</i>; if omitted, the <i>positive flexibility</i> defaults to ''1''. The <code>&lt;neg-flex></code> component sets the <i>negative flexibility</i>; if omitted, it defaults to ''0''.</p>
602602

603-
<p>The <code>&lt;preferred-size></code> component sets the preferred size. It can be set to any value that would be valid in the 'width' or 'height' property, except values that are not applicable to a component value (of values defined in CSS2.1, only &#39;inherit&#39; is not valid for <code>&lt;preferred-size></code>; in the future other values may be introduced that are not applicable as length component). If omitted, the preferred size defaults to ''0px''. If the <code>&lt;preferred-size></code> component is ''auto'' on a <i>flexbox item</i>, the <i>preferred size</i> is the <i>main size property</i>&apos;s value.</p>
603+
<p>The <code>&lt;preferred-size></code> component sets the preferred size. It can be set to any value that would be valid in the 'width' or 'height' property, except values that are not applicable to a component value (of values defined in CSS2.1, only &#39;inherit&#39; is not valid for <code>&lt;preferred-size></code>; in the future other values may be introduced that are not applicable as length component). If omitted, the preferred size defaults to ''0px''. If the <code>&lt;preferred-size></code> component is ''auto'' on a child of a <i>flexbox</i>, the <i>preferred size</i> is the <i>main size property</i>&apos;s value.</p>
604604

605605
<p>If the <code>&lt;preferred-size></code> is ''0'', it <strong>must</strong> be specified with a unit (like ''0px'') to avoid ambiguity; unitless zero will either be interpreted as as one of the flexibilities, or is a syntax error.</p>
606606

607607
<p>The keyword 'none' computes to "0 0 auto". </p>
608608

609-
<p>The 'flex' property is transitionable if the element is a <i>flexbox item</i> and the <i>preferred size</i> is transitionable, by transitioning the <i>positive flexibility</i>, <i>negative flexibility</i>, and <i>preferred size</i> independently.</p>
609+
<p>The 'flex' property is transitionable if the element is a child of a <i>flexbox</i> and the <i>preferred size</i> is transitionable, by transitioning the <i>positive flexibility</i>, <i>negative flexibility</i>, and <i>preferred size</i> independently.</p>
610610

611611
<div class='example'>
612612
<p>Flexibility allows elements to respond directly to the available space,

0 commit comments

Comments
 (0)