csswg/css3-flexbox Overview.html,1.138,1.139 Overview.src.html,1.136,1.137

• From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
• Date: Tue, 31 Jan 2012 01:09:42 +0000
• To: public-css-commits@w3.org
• Message-Id: <E1Rs2EA-0008Iy-Vm@lionel-hutz.w3.org>

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

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Tweak the line-breaking calculations.

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.html,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- Overview.html	31 Jan 2012 00:42:34 -0000	1.138
+++ Overview.html	31 Jan 2012 01:09:40 -0000	1.139
@@ -1842,7 +1842,8 @@
 
        <dt>size doesn't rely on its contents
 
-       <dd>The maximum line length is main size of the flexbox's content box.
+       <dd>The maximum line length is main size of the flexbox's content box,
+        constrained by the min and max main size constraints of the flexbox.
 
        <dt>&lsquo;<code class=css>min-content</code>&rsquo;
 
@@ -1850,13 +1851,14 @@
 
        <dt>&lsquo;<code class=css>max-content</code>&rsquo;
 
-       <dd>The maximum line length is the flexbox's maximum main size, or
-        infinity if it has no maximum main size.
+       <dd>The maximum line length is infinity, constrained by the main and
+        max main size constraints of the flexbox.
 
        <dt>&lsquo;<code class=css>fit-content</code>&rsquo;
 
-       <dd>Same as if the flexbox was sized as &lsquo;<code
-        class=css>fill-available</code>&rsquo;.
+       <dd>The maximum line length is the greater of the flexbox's main size
+        constraint and the smaller of the flexbox's maximum size constraint
+        and the available space.
       </dl>
 
      <li>Collect as many consecutive flexbox items as possible, starting from

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.src.html,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- Overview.src.html	31 Jan 2012 00:42:34 -0000	1.136
+++ Overview.src.html	31 Jan 2012 01:09:40 -0000	1.137
@@ -903,16 +903,16 @@
 
 					<dt>
 						<dt>size doesn't rely on its contents</dt>
-						<dd>The maximum line length is main size of the flexbox's content box.</dd>
+						<dd>The maximum line length is main size of the flexbox's content box, constrained by the min and max main size constraints of the flexbox.</dd>
 
 						<dt>''min-content''</dt>
 						<dd>The maximum line length is the flexbox's minimum main size.</dd>
 
 						<dt>''max-content''</dt>
-						<dd>The maximum line length is the flexbox's maximum main size, or infinity if it has no maximum main size.</dd>
+						<dd>The maximum line length is infinity, constrained by the main and max main size constraints of the flexbox.</dd>
 
 						<dt>''fit-content''</dt>
-						<dd>Same as if the flexbox was sized as ''fill-available''.</dd>
+						<dd>The maximum line length is the greater of the flexbox's main size constraint and the smaller of the flexbox's maximum size constraint and the available space.</dd>
 					</dt>
 				</li>
 

Received on Tuesday, 31 January 2012 01:09:44 UTC