@@ -3881,7 +3881,7 @@ Resolve Intrinsic Track Sizes</h3>
38813881 Find the |item-incurred increase| for each spanned track with an affected size
38823882 by distributing the space equally among them,
38833883 freezing tracks as their size reaches their <a>growth limit</a>
3884- (and continuing to grow the unfrozen tracks as needed.
3884+ (and continuing to grow the unfrozen tracks as needed) .
38853885
38863886 If a track was marked as <a>infinitely growable</a> for this phase,
38873887 treat its <a>growth limit</a> as infinite for this calculation
@@ -3920,7 +3920,8 @@ Resolve Intrinsic Track Sizes</h3>
39203920 </ol>
39213921 <li>
39223922 <strong> Update the tracks' affected sizes</strong>
3923- by adding in the |planned increase|.
3923+ by adding in the |planned increase|
3924+ so that the next round of space distribution will account for the increase.
39243925 (If the affected size is an infinite <a>growth limit</a> ,
39253926 set it to the track's <a>base size</a> plus the |planned increase|.)
39263927 </ol>
@@ -4199,26 +4200,52 @@ Acknowledgements</h2>
41994200<h2 class="no-num" id="changes">
42004201Changes</h2>
42014202
4202- Changes since the <a href="https://www.w3.org/TR/2016/CR-css-grid-1-20160929/">29 September 2016 Candidate Recommendation</a> are:
4203+ This section documents the changes since previous publications.
4204+
4205+ <h3 id="changes-2016">
4206+ Changes since the <a href="https://www.w3.org/TR/2016/CR-css-grid-1-20160929/">29 September 2016 CR</a></h3>
4207+
4208+ A <a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016">Disposition of Comments</a> is also available.
4209+
4210+ There remains an open issue on
4211+ <a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016#issue-15">percentages inside shrink-wrapped grid containers</a>
4212+ at the time of publication.
4213+
4214+ <h4 id="major-2016">
4215+ Major Changes</h4>
42034216
42044217 <ul>
4205- <li>
4218+ <li id="change-2016-defer-subgrid" >
42064219 Deferred ''subgrid'' feature to Level 2
42074220 due to lack of implementation and desire for further discussion.
42084221 (<a href="https://github.com/w3c/csswg-drafts/issues/958">Issue 958</a> )
42094222
4210- <li>
4223+ <li id="change-2016-unshorthand-gaps" >
42114224 Removed 'grid-row-gap' and 'grid-column-gap'
42124225 from the list of properties reset by the 'grid' shorthand.
42134226 (<a href="https://github.com/w3c/csswg-drafts/issues/1036">Issue 1036</a> )
42144227
4215- <li>
4228+ <li id="change-2016-grid-gap" >
42164229 Removed 'grid-row-gap' , 'grid-column-gap' , and 'grid-gap' properties,
42174230 replacing with 'row-gap' , 'column-gap' , and 'gap'
42184231 which are now defined in <a href="http://www.w3.org/TR/css-align-3/">CSS Box Alignment</a> .
42194232 (<a href="https://github.com/w3c/csswg-drafts/issues/1696">Issue 1696</a> )
42204233
4221- <li>
4234+ <li id="change-2016-auto-ratio">
4235+ Changed <a href="#grid-item-sizing">automatic sizing</a>
4236+ of grid items (such as images) with an intrinsic size or ratio
4237+ so that they maintain their intrinsic size/ratio
4238+ whenever the alignment properties are ''align-self/normal'' (the default case).
4239+ (<a href="https://github.com/w3c/csswg-drafts/issues/523">Issue #523</a> )
4240+ See <a href="#grid-item-sizing"></a>
4241+ (vs. <a href="https://www.w3.org/TR/2016/CR-css-grid-1-20160929/#grid-item-sizing">original</a> ).
4242+ </ul>
4243+
4244+ <h4 id="fixes-2016">
4245+ Significant Adjustments and Fixes</h4>
4246+
4247+ <ul>
4248+ <li id="change-2016-flex-clamping-indefinite">
42224249 Applied flex factor clamping to 1 also to indefinite case
42234250 (<a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016#issue-26">Issue 26</a> ,
42244251 see <a href="https://lists.w3.org/Archives/Public/www-style/2015Sep/0032.html">discussion</a> ):
@@ -4231,7 +4258,7 @@ Changes</h2>
42314258 the track's <a>base size</a> .</ins></p>
42324259 </blockquote>
42334260
4234- <li>
4261+ <li id="change-2016-stretch-algo" >
42354262 Better integrated ''justify-content/stretch'' sizing of grid tracks
42364263 into the track sizing algorithm.
42374264 (<a href="https://github.com/w3c/csswg-drafts/issues/1150">Issue 1150</a> )
@@ -4269,16 +4296,7 @@ Changes</h2>
42694296 </ins>
42704297 </blockquote>
42714298
4272- <li>
4273- Changed <a href="#grid-item-sizing">automatic sizing</a>
4274- of grid items (such as images) with an intrinsic size or ratio
4275- so that they maintain their intrinsic size/ratio
4276- whenever the alignment properties are ''align-self/normal'' (the default case).
4277- (<a href="https://github.com/w3c/csswg-drafts/issues/523">Issue #523</a> )
4278- See <a href="#grid-item-sizing"></a>
4279- (vs. <a href="https://www.w3.org/TR/2016/CR-css-grid-1-20160929/#grid-item-sizing">original</a> ).
4280-
4281- <li>
4299+ <li id="change-2016-auto-min-fixed-tracks">
42824300 Adjusted <a href="#min-size-auto">automatic minimum size</a> of grid items
42834301 to only trigger when spanning ''grid-template-columns/auto'' tracks
42844302 (<a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016#issue-12">Issue 12</a> )
@@ -4302,7 +4320,26 @@ Changes</h2>
43024320 <ins> (so as to prevent the <a>automatic minimum size</a> from forcing overflow of its fixed-size grid area)</ins> .</p>
43034321 </blockquote>
43044322
4305- <li>
4323+ <li id="change-2016-auto-min-fallback">
4324+ Adjusted <a href="#min-size-auto">automatic minimum size</a> of grid items
4325+ to use the transferred size in preference to the content size,
4326+ rather than taking the smaller of the two.
4327+ (<a href="https://github.com/w3c/csswg-drafts/issues/1149">Issue #1149</a> )
4328+ <blockquote>
4329+ <p> … <del> The effect is analogous to the <a>automatic minimum size</a>
4330+ imposed on <a>flex items</a> .)
4331+ [[!CSS-FLEXBOX-1]] </del></p>
4332+ <p><ins> The <a>automatic minimum size</a> for a <a>grid item</a> in a given dimension is
4333+ its <a spec="css-flexbox">specified size</a> if it exists,
4334+ otherwise its <a spec="css-flexbox">transferred size</a> if that exists,
4335+ else its <a spec="css-flexbox">content size</a> ,
4336+ each as defined in [[!CSS-FLEXBOX-1]] .</ins>
4337+ However, if the <a>grid item</a> spans only <a>grid tracks</a>
4338+ that have a <a lt="fixed sizing function">fixed</a> <a>max track sizing function</a>
4339+ …
4340+ </blockquote>
4341+
4342+ <li id="change-2016-auto-max-constraint">
43064343 Fixed error in algorithm’s handling of ''grid-template-columns/auto'' min track sizes
43074344 where it didn't correctly handle max-content constraints;
43084345 and also made some editorial improvements.
@@ -4337,7 +4374,52 @@ Changes</h2>
43374374 </ol>
43384375 </blockquote>
43394376
4340- <li> Clarified definition of <a>min-size contribution</a> .
4377+ <li id="change-2016-span-size-accumulation">
4378+ Fixed error in <a>distribute extra space</a> algorithm,
4379+ where the accumulation was folded in per item rather than per track set;
4380+ and where it was not clear that distributed space per item
4381+ should be max()ed with the planned increase rather than added to it.
4382+ (<a href="https://github.com/w3c/csswg-drafts/issues/1729">Issue #1729</a> )
4383+
4384+ <blockquote>
4385+ <ol>
4386+ <li value=2>
4387+ For each considered item,
4388+ <ol>
4389+ <li> …
4390+ <li>
4391+ <strong> Distribute space to base sizes up to growth limits:</strong>
4392+ <del> Distribute the space equally to the planned increase of each spanned track with an affected size</del>
4393+ <ins> Find the |item-incurred increase| for each spanned track with an affected size
4394+ by distributing the space equally among them</ins> ,
4395+ freezing tracks as their size reaches their <a>growth limit</a>
4396+ (and continuing to grow the unfrozen tracks as needed).
4397+ …
4398+ <li>
4399+ <strong> Distribute space beyond growth limits:</strong>
4400+ If space remains after all tracks are frozen,
4401+ unfreeze and continue to distribute space to
4402+ <ins> the |item-incurred increase| of</ins> …
4403+ <li>
4404+ <ins> For each affected track,
4405+ if the track’s |item-incurred increase| is larger than the track’s |planned increase|
4406+ set the track’s |planned increase| to that value.</ins>
4407+ </ol>
4408+ <li><ins> [numbering change from <del>2.4</del> to 3] </ins>
4409+ <strong> Update the tracks' affected sizes</strong>
4410+ by adding in the |planned increase|.
4411+ (If the affected size is an infinite <a>growth limit</a> ,
4412+ set it to the track's <a>base size</a> plus the |planned increase|.)
4413+ </ol>
4414+ </blockquote>
4415+ </ul>
4416+
4417+ <h4 id="clarify-2016">
4418+ Clarifications</h4>
4419+
4420+ <ul id="change-2016-auto-min-editorial">
4421+ <li>
4422+ Clarified definition of <a>min-size contribution</a> .
43414423 (<a href="https://github.com/w3c/csswg-drafts/issues/507">Issue #507</a> )
43424424 <blockquote>
43434425 <p> Otherwise,
@@ -4353,14 +4435,30 @@ Changes</h2>
43534435 is ''width/auto'' ,
43544436 or else the item’s <a>min-content contribution</a> .
43554437 </blockquote>
4356-
4438+ <li id="change-2016-collapsed-gutter-alignment">
4439+ Clarified that the space allotted through <a>distributed alignment</a>
4440+ is part of the gutter, and collapses with it.
4441+ (<a href="https://github.com/w3c/csswg-drafts/issues/1140">Issue #1140</a> )
4442+ <blockquote>
4443+ <p> A <a>collapsed track</a> is treated as having
4444+ a fixed <a>track sizing function</a> of ''0px'' ,
4445+ and the <a>gutters</a> on either side of it<ins> --
4446+ including any space allotted through <a>distributed alignment</a> --
4447+ </ins> <a>collapse</a> .</p>
4448+ </blockquote>
4449+ See also changes to <a href="https://www.w3.org/TR/css-align-3/">CSS Box Alignment</a> :
4450+ <blockquote>
4451+ <p> Alignment Subject(s):
4452+ <del> The non-<a spec="css-grid" lt="collapsed track">collapsed</a> <a>grid tracks</a> in the appropriate axis.</del>
4453+ <ins> The <a>grid tracks</a> in the appropriate axis,
4454+ with any spacing inserted between tracks
4455+ added to the relevant <a>gutters</a> ,
4456+ and treating <a>collapsed gutters</a>
4457+ as a single opportunity for space insertion.</ins>
4458+ </blockquote>
43574459 <li> Miscellaneous trivial fixes: broken references, typos, etc.
43584460 </ul>
43594461
4360- A <a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016">Disposition of Comments</a> is available.
4361- There remains an open issue on
4362- <a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016#issue-15">percentages inside shrink-wrapped grid containers</a>
4363- at the time of publication.
43644462
43654463Privacy and Security Considerations {#priv-sec}
43664464===============================================
0 commit comments