Mercurial > drafts / changeset

     1.1 --- a/css-flexbox/Overview.bs	Tue May 06 16:52:26 2014 -0400
     1.2 +++ b/css-flexbox/Overview.bs	Tue May 06 14:30:49 2014 -0700
     1.3 @@ -2333,6 +2333,13 @@
     1.4  			for all other items,
     1.5  			both flexible and inflexible,
     1.6  			use their outer <a>flex base size</a>.
     1.7 +			If the <i>flex grow factor</i> is being used for this algorithm,
     1.8 +			clamp the items’ <a>flex base size</a>
     1.9 +			by their max main size;
    1.10 +			if the <i>flex shrink factor</i> is being used for this algorithm,
    1.11 +			clamp the items’ <a>flex base size</a>
    1.12 +			by the min main size.
    1.13 +
    1.14  			Subtract this sum from the flex container's inner main size.
    1.15  			This is the free space.
    1.16  

     2.1 --- a/css-flexbox/Overview.html	Tue May 06 16:52:26 2014 -0400
     2.2 +++ b/css-flexbox/Overview.html	Tue May 06 14:30:49 2014 -0700
     2.3 @@ -2360,8 +2360,15 @@
     2.4  			for all other items,
     2.5  			both flexible and inflexible,
     2.6  			use their outer <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a>.
     2.7 -			Subtract this sum from the flex container’s inner main size.
     2.8 -			This is the free space.
     2.9 +			If the <a data-link-type=dfn href=#flex-grow-factor title="flex grow factor">flex grow factor</a> is being used for this algorithm,
    2.10 +			clamp the items’ <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a>
    2.11 +			by their max main size;
    2.12 +			if the <a data-link-type=dfn href=#flex-shrink-factor title="flex shrink factor">flex shrink factor</a> is being used for this algorithm,
    2.13 +			clamp the items’ <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a>
    2.14 +			by the min main size.
    2.15 +
    2.16 +<p>Subtract this sum from the flex container’s inner main size.
    2.17 +			This is the free space.</p>
    2.18  
    2.19  		<li>
    2.20  			<strong>Calculate desired free space.</strong>