csswg/css3-flexbox Overview.html,1.78,1.79 Overview.src.html,1.78,1.79

Update of /sources/public/csswg/css3-flexbox
In directory hutz:/tmp/cvs-serv26269

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Move the text about resolving flex(), and make it clearer exactly what happens at computed/used time.

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Overview.html	8 Dec 2011 21:55:12 -0000	1.78
+++ Overview.html	8 Dec 2011 22:38:10 -0000	1.79
@@ -920,6 +920,12 @@
    href="#preferred-size"><i>preferred size</i></a>; if omitted, it defaults
    to &lsquo;<code class=css>0px</code>&rsquo;.
 
+  <p>If the &lsquo;<code class=css>flex()</code>&rsquo; function is specified
+   on an element that is not a <a href="#flexbox-item"><i>flexbox
+   item</i></a>, it computes to the <a href="#preferred-size"><i>preferred
+   size</i></a>. Otherwise, it computes to itself, and is resolved to a
+   length at used-value time by the flexbox layout algorithm.
+
   <p class=issue>Examples!
 
   <h3 id=resolving-flexible-lengths><span class=secno>4.2. </span> Resolving
@@ -978,13 +984,6 @@
    living here only until I flesh out the layout algorithm section. Then this
    can return to being a fairly simple explanation of what goes on.
 
-  <p>If a flexible length is used in a context where it is not allowed (for
-   example, on the &lsquo;<code class=property>width</code>&rsquo; property
-   of an element that is not a <a href="#flexbox-item"><i>flexbox
-   item</i></a>), it represents its <a href="#preferred-size"><i>preferred
-   size</i></a>. Authors must not use flexible lengths in contexts where they
-   are not allowed.
-
   <p class=issue>Examples!
 
   <h2 id=alignment><span class=secno>5. </span> Alignment</h2>

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.src.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Overview.src.html	8 Dec 2011 21:55:12 -0000	1.78
+++ Overview.src.html	8 Dec 2011 22:38:10 -0000	1.79
@@ -412,6 +412,8 @@
 
 	<p>The <code>&lt;pos-flex></code> component sets the length's <i>positive flexibility</i>; if omitted, the <i>positive flexibility</i> defaults to ''1''.  The <code>&lt;neg-flex></code> component sets the length's <i>negative flexibility</i>; if omitted, it defaults to ''0''.  The <code>&lt;preferred-size></code> component sets the length's <i>preferred size</i>; if omitted, it defaults to ''0px''.</p>
 
+	<p>If the ''flex()'' function is specified on an element that is not a <i>flexbox item</i>, it computes to the <i>preferred size</i>.  Otherwise, it computes to itself, and is resolved to a length at used-value time by the flexbox layout algorithm.</p>
+
 	<p class='issue'>Examples!</p>
 
 
@@ -438,8 +440,6 @@
 
 	<p class='issue'>This is too much detail for a non-normative section.  This is living here only until I flesh out the layout algorithm section.  Then this can return to being a fairly simple explanation of what goes on.</p>
 
-	<p>If a flexible length is used in a context where it is not allowed (for example, on the 'width' property of an element that is not a <i>flexbox item</i>), it represents its <i>preferred size</i>.  Authors must not use flexible lengths in contexts where they are not allowed.</p>
-
 	<p class='issue'>Examples!</p>

Received on Thursday, 8 December 2011 22:38:16 UTC