merge

Author: dauwhe

css-flexbox/Overview.bs

@@ -802,7 +802,7 @@ Implied Minimum Size of Flex Items</h3>
 	<dl dfn-type=value dfn-for="min-width, min-height">
 		<dt><dfn>auto</dfn>
 		<dd>
-			On a <a>flex item</a> whose 'overflow' is not ''overflow/visible'',
+			On a <a>flex item</a> whose 'overflow' is ''overflow/visible'',
 			this keyword specifies as the minimum size the smaller of:
 
 			<ul>
@@ -1958,41 +1958,9 @@ Flex Baselines</h3>
 		When <a href="http://www.w3.org/TR/CSS21/tables.html#height-layout">determining the baseline of a table cell</a>,
 		a flex container provides a baseline just as a line box or table-row does. [[!CSS21]]
 
-	<div class='note'>
-		<p>
-			CSS 2.1 did not define the baseline of block or table boxes.
-			It is expected that they will be defined consistent with those of <a href="http://www.w3.org/TR/CSS2/tables.html#height-layout">table cells</a>,
-			as follows:
-
-		<dl>
-			<dt>''block''
-			<dt>''list-item''
-			<dd>
-				<p>
-					The inline-axis baseline of a block is the baseline of the first in-flow line box in the block,
-					or the first in-flow block-level child in the block that has a baseline,
-					whichever comes first.
-					If there is no such line box or child,
-					then the block has no baseline.
-					For the purposes of finding a baseline,
-					in-flow boxes with a scrolling mechanisms (see the 'overflow' property)
-					must be considered as if scrolled to their origin position.
-
-				<p>
-					A block has no block-axis baseline.
-
-			<dt>''table''
-			<dd>
-				<p>
-					The inline-axis baseline of a table box is the baseline of its first row.
-					However, when calculating the baseline of an inline-block,
-					table boxes must be skipped.
-
-				<p>
-					The block-axis baseline of a table is undefined.
-		</dl>
-	</div>
-
+	<p>
+		See <a href="http://www.w3.org/TR/css3-align/#baseline-rules">Baseline Rules</a>
+		in [[CSS3-ALIGN]] for more information on baseline alignment.
 
 
 <h2 id='layout-algorithm'>
@@ -2210,9 +2178,16 @@ Cross Size Determination</h3>
 					find the largest outer <i>hypothetical cross size</i>.
 
 				<li>
-					The used cross-size of the flex line is the largest of the numbers found in the previous two steps and zero.
+					The used cross-size of the <a>flex line</a> is the largest of the numbers found in the previous two steps and zero.
+
+					If the flex container has only one flex line
+					(even if it's a multi-line flex container),
+					then clamp the line's cross-size to be within the container's computed min and max cross-size properties.
+					<span class='note'>Note that if CSS 2.1's definition of min/max-width/height applied more generally,
+					this behavior would fall out automatically.</span>
 			</ol>
 
+
 		<li id='algo-line-stretch'>
 			<strong>Handle 'align-content: stretch'.</strong>
 			If the flex container has a <i>definite</i> cross size,
@@ -2814,10 +2789,47 @@ Morten Stenshorne,
 Christian Stockwell,
 Ojan Vafai,
 Eugene Veselov,
+Greg Whitworth,
 Boris Zbarsky.
 
 <h2 class="no-num" id="changes">Changes</h2>
 
+<h3 id="changes-20140325">
+Changes since the 25 March 2014 LCWD</h3>
+
+	The following significant changes were made since the
+	<a href="http://www.w3.org/TR/2014/WD-css-flexbox-1-20140325/">25 March 2014 Last Call Working Draft</a>:
+
+	<ul>
+		<li id="change-20140325-min-auto-not">
+			Fixed typo in definition of ''min-height/min-width: auto''.
+
+			<blockquote>
+				On a <a>flex item</a> whose 'overflow' is <del>not</del> ''overflow/visible'',
+			</blockquote>
+
+		<li id="change-20140325-clamp-single-line">
+			Clamp a single line flexbox's line cross size to the container's own min/max,
+			even when the container's size is indefinite.
+			(Matches Blink's behavior.)
+
+			<blockquote>
+				<ul>
+					<li>
+						The used cross-size of the <a>flex line</a> is the largest of the numbers found in the previous two steps and zero.
+
+						<p><ins>If the flex container has only one flex line
+						(even if it's a multi-line flex container),
+						then clamp the line's cross-size to be within the container's computed min and max cross-size properties.
+						<span class='note'>Note that if CSS 2.1's definition of min/max-width/height applied more generally,
+						this behavior would fall out automatically.</span></ins>
+				</ul>
+			</blockquote>
+
+	</ul>
+
+	A <a href="http://dev.w3.org/csswg/css3-flexbox/issues-lc-20140325/">Disposition of Comments</a> is available.
+
 <h3 id="changes-2012">
 Changes since the 18 September 2012 Candidate Recommendation</h3>
 
@@ -2945,7 +2957,7 @@ Changes since the 18 September 2012 Candidate Recommendation</h3>
 			<blockquote>
 				<ins>
 				<!--
-					<h3 id='intrinsic-sizes'>
+					<h3 id="intrinsic-sizes">
 					Intrinsic Sizes</h3>
 				-->
 					<p>
@@ -3236,4 +3248,4 @@ Changes since the 18 September 2012 Candidate Recommendation</h3>
 			</blockquote>
 	</ul>
 
-	<p>A <a href="http://dev.w3.org/csswg/css3-flexbox/issues-cr-2012">Disposition of Candidate Recommendation Comments</a> is available.
+	A <a href="http://dev.w3.org/csswg/css3-flexbox/issues-cr-2012">Disposition of Candidate Recommendation Comments</a> is available.