- From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 06 Feb 2012 22:02:41 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-flexbox
In directory hutz:/tmp/cvs-serv32665
Modified Files:
Overview.html Overview.src.html
Log Message:
Tweak the max-line-size step in the layout algorithm.
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.html,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- Overview.html 6 Feb 2012 21:52:48 -0000 1.150
+++ Overview.html 6 Feb 2012 22:02:38 -0000 1.151
@@ -1849,31 +1849,24 @@
<ol>
<li>
<p>Determine the maximum line length, based on the main size of the
- flexbox:</p>
-
- <dl>
- <dt>
-
- <dt>size doesn't rely on its contents
-
- <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>‘<code class=css>min-content</code>’
-
- <dd>The maximum line length is the flexbox's minimum main size.
-
- <dt>‘<code class=css>max-content</code>’
+ flexbox. 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. If the main size depends on the flexbox's content, then:</p>
- <dd>The maximum line length is infinity, constrained by the min and
- max main size constraints of the flexbox.
+ <ul>
+ <li>for ‘<code class=css>min-content</code>’, the maximum
+ line length is the flexbox's minimum main size, constrained by the
+ min and max main size constraints of the flexbox.
- <dt>‘<code class=css>fit-content</code>’
+ <li>for ‘<code class=css>max-content</code>’, the maximum
+ line length is infinity, constrained by the min and max main size
+ constraints of the flexbox.
- <dd>The maximum line length is the greater of the flexbox's min size
- constraint and the smaller of the flexbox's max size constraint and
- the available space.
- </dl>
+ <li>for ‘<code class=css>fit-content</code>’, the maximum
+ line length is the greater of the flexbox's min size constraint and
+ the smaller of the flexbox's max size constraint and the available
+ space.
+ </ul>
<li>Collect as many consecutive flexbox items as possible, starting from
the first item, while keeping the sum of their main size smaller than
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.src.html,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- Overview.src.html 6 Feb 2012 21:52:49 -0000 1.148
+++ Overview.src.html 6 Feb 2012 22:02:39 -0000 1.149
@@ -904,21 +904,15 @@
<ol>
<li>
- <p>Determine the maximum line length, based on the main size of the flexbox:</p>
-
- <dt>
- <dt>size doesn't rely on its contents</dt>
- <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>
+ <p>Determine the maximum line length, based on the main size of the flexbox. 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. If the main size depends on the flexbox's content, then:</p>
- <dt>''min-content''</dt>
- <dd>The maximum line length is the flexbox's minimum main size.</dd>
+ <ul>
+ <li>for ''min-content'', the maximum line length is the flexbox's minimum main size, constrained by the min and max main size constraints of the flexbox.</li>
- <dt>''max-content''</dt>
- <dd>The maximum line length is infinity, constrained by the min and max main size constraints of the flexbox.</dd>
+ <li>for ''max-content'', the maximum line length is infinity, constrained by the min and max main size constraints of the flexbox.</li>
- <dt>''fit-content''</dt>
- <dd>The maximum line length is the greater of the flexbox's min size constraint and the smaller of the flexbox's max size constraint and the available space.</dd>
- </dt>
+ <li>for ''fit-content'', the maximum line length is the greater of the flexbox's min size constraint and the smaller of the flexbox's max size constraint and the available space.</li>
+ </ul>
</li>
<li>Collect as many consecutive flexbox items as possible, starting from the first item, while keeping the sum of their main size smaller than the flexbox's available space. If a flexbox item is sized with a flexible length, then for the purpose of this step, clamp the item's size between its minimum and maximum main sizes. The items so collected form a single flexbox line.</li>
Received on Monday, 6 February 2012 22:02:53 UTC