Skip to content

Commit

Permalink
[css-grid] Remove attempt at integrating baseline alignment, related to
Browse files Browse the repository at this point in the history
  • Loading branch information
tabatkins committed Oct 13, 2017
1 parent aaa14fe commit 655f15d
Showing 1 changed file with 5 additions and 23 deletions.
28 changes: 5 additions & 23 deletions css-grid-1/Overview.bs
Original file line number Diff line number Diff line change
Expand Up @@ -3747,11 +3747,6 @@ Resolve Intrinsic Track Sizes</h3>
furthermore clamp this <a>growth limit</a> by the ''fit-content()'' argument.
</dl>

<ins><p>In all cases, if any items participate in <a>baseline alignment</a>,
perform baseline alignment to calculate the extra space it would require,
and add that to the track’s <a>base size</a> and/or <a>growth limit</a>
as needed.</p></ins>

In all cases, if a track’s <a>growth limit</a> is now less than its <a>base size</a>,
increase the <a>growth limit</a> to match the <a>base size</a>.

Expand All @@ -3771,22 +3766,19 @@ Resolve Intrinsic Track Sizes</h3>
First increase the <a>base size</a> of tracks with
an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>
by <a href="#extra-space">distributing extra space</a> as needed
to accommodate these items’ <a>min-size contributions</a>
<ins>and <a>baseline alignment</a></ins>.
to accommodate these items’ <a>min-size contributions</a>.
<li>
<strong>For content-based minimums:</strong>
Next continue to increase the <a>base size</a> of tracks with
a <a>min track sizing function</a> of ''min-content'' or ''max-content''
by <a href="#extra-space">distributing extra space</a> as needed
to account for these items' <a>min-content contributions</a>
<ins>and baseline alignment</ins>.
to account for these items' <a>min-content contributions</a>.
<li>
<strong>For max-content minimums:</strong>
Third continue to increase the <a>base size</a> of tracks with
a <a>min track sizing function</a> of ''max-content''
by <a href="#extra-space">distributing extra space</a> as needed
to account for these items' <a>max-content contributions</a>
<ins>and baseline alignment</ins>.
to account for these items' <a>max-content contributions</a>.
<li>
If at this point any track’s <a>growth limit</a> is now less than its <a>base size</a>,
increase its <a>growth limit</a> to match its <a>base size</a>.
Expand All @@ -3795,8 +3787,7 @@ Resolve Intrinsic Track Sizes</h3>
Next increase the <a>growth limit</a> of tracks with
an <a lt="intrinsic sizing function">intrinsic</a> <a>max track sizing function</a>
by <a href="#extra-space">distributing extra space</a> as needed
to account for these items' <a>min-size contributions</a>
<ins>and baseline alignment</ins>.
to account for these items' <a>min-size contributions</a>.
Mark any tracks whose <a>growth limit</a> changed
from infinite to finite in this step
as <dfn>infinitely growable</dfn> for the next step.
Expand Down Expand Up @@ -3845,8 +3836,7 @@ Resolve Intrinsic Track Sizes</h3>
Lastly continue to increase the <a>growth limit</a> of tracks with
a <a>max track sizing function</a> of ''max-content''
by <a href="#extra-space">distributing extra space</a> as needed
to account for these items' <a>max-content contributions</a>
<ins>and baseline alignment</ins>.
to account for these items' <a>max-content contributions</a>.
However, limit the growth of any ''fit-content()'' tracks
by their ''fit-content()'' argument.
</ol>
Expand Down Expand Up @@ -3942,14 +3932,6 @@ Distributing Extra Space Across Spanned Tracks</h4>
set it to the track's <a>base size</a> plus the |planned increase|.)
</ol>

<ins><p>The extra space required to accommodate
an item’s participation in <a>baseline alignment</a>
is distributed by
calculating the shims required for including their participation
with already-considered items (those of lesser or equal spanning size)
and distributing the shims’ space as if it were
part of the shimmed items’ original size contribution.</p></ins>


<h3 id="algo-grow-tracks">
Maximize Tracks</h3>
Expand Down

0 comments on commit 655f15d

Please sign in to comment.