Tue, 05 Jun 2012 14:48:18 -0700
Fixed a few stray references to 'flex basis' in section 9.7 to instead refer to the hypothetical size.
css3-flexbox/Overview.html | file | annotate | diff | comparison | revisions | |
css3-flexbox/Overview.src.html | file | annotate | diff | comparison | revisions |
1.1 --- a/css3-flexbox/Overview.html Tue Jun 05 14:11:36 2012 -0700 1.2 +++ b/css3-flexbox/Overview.html Tue Jun 05 14:48:18 2012 -0700 1.3 @@ -2739,21 +2739,22 @@ 1.4 <dd> Find the ratio of the item's <a href="#flex-grow-ratio"><i>flex 1.5 grow ratio</i></a> to the sum of the <a href="#flex-grow-ratio"><i>flex 1.6 grow ratios</i></a> of all items on the line. Set the item's main size 1.7 - to its <a href="#flex-basis"><i>flex basis</i></a> plus a fraction of 1.8 - the free space proportional to the ratio. 1.9 + to its hypothetical main size plus a fraction of the free space 1.10 + proportional to the ratio. 1.11 1.12 <dt>If the flexibility is negative 1.13 1.14 <dd> For every item on the line, multiply its <a 1.15 - href="#flex-shrink-ratio"><i>flex shrink ratio</i></a> by its <a 1.16 - href="#flex-basis"><i>flex basis</i></a>, and note this as its <dfn 1.17 + href="#flex-shrink-ratio"><i>flex shrink ratio</i></a> by its 1.18 + hypothetical outer main size, and note this as its <dfn 1.19 id=scaled-flex-shrink-ratio>scaled flex shrink ratio</dfn>. Find the 1.20 ratio of the item's <a href="#scaled-flex-shrink-ratio"><i>scaled flex 1.21 shrink ratio</i></a> to the sum of the <a 1.22 href="#scaled-flex-shrink-ratio"><i>scaled flex shrink ratios</i></a> 1.23 - of all items on the line. Set the item's main size to its <a 1.24 - href="#flex-basis"><i>flex basis</i></a> minus a fraction of the free 1.25 - space proportional to the ratio. 1.26 + of all items on the line. Set the item's main size to its hypothetical 1.27 + main size minus a fraction of the free space proportional to the ratio. 1.28 + (This may result in a negative inner main size. This must be fixed in 1.29 + the next step for correct results.) 1.30 </dl> 1.31 1.32 <li> <strong>Fix min/max violations.</strong> Clamp each item's main size
2.1 --- a/css3-flexbox/Overview.src.html Tue Jun 05 14:11:36 2012 -0700 2.2 +++ b/css3-flexbox/Overview.src.html Tue Jun 05 14:48:18 2012 -0700 2.3 @@ -2067,7 +2067,7 @@ 2.4 Find the ratio of the item's <i>flex grow ratio</i> 2.5 to the sum of the <i>flex grow ratios</i> of all items on the line. 2.6 Set the item's main size 2.7 - to its <i>flex basis</i> 2.8 + to its hypothetical main size 2.9 plus a fraction of the free space 2.10 proportional to the ratio. 2.11 2.12 @@ -2075,14 +2075,16 @@ 2.13 <dd> 2.14 For every item on the line, 2.15 multiply its <i>flex shrink ratio</i> 2.16 - by its <i>flex basis</i>, 2.17 + by its hypothetical outer main size, 2.18 and note this as its <dfn>scaled flex shrink ratio</dfn>. 2.19 Find the ratio of the item's <i>scaled flex shrink ratio</i> 2.20 to the sum of the <i>scaled flex shrink ratios</i> of all items on the line. 2.21 Set the item's main size 2.22 - to its <i>flex basis</i> 2.23 + to its hypothetical main size 2.24 minus a fraction of the free space 2.25 proportional to the ratio. 2.26 + (This may result in a negative inner main size. 2.27 + This must be fixed in the next step for correct results.) 2.28 </dl> 2.29 2.30 <li>