Skip to content

Commit 2f31025

Browse files
committed
[css-grid-1] Revert fix to w3c#3705 so that items crossing flexible tracks do not contribute to inflexible intrinsically-sized tracks. w3c#4783"
This reverts commit 90511c6.
1 parent f43b8f9 commit 2f31025

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

css-grid-1/Overview.bs

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4137,9 +4137,7 @@ Resolve Intrinsic Track Sizes</h3>
41374137
<li id="algo-spanning-items">
41384138
<strong>Increase sizes to accommodate spanning items crossing content-sized tracks:</strong>
41394139
Next, consider the items with a span of 2
4140-
that do not span a track with both
4141-
a <a>flexible sizing function</a> and
4142-
an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>.
4140+
that do not span a track with a <a>flexible sizing function</a>.
41434141
<!-- auto-min contribution <= min-content contribution <= max-content contribution -->
41444142

41454143
<ol>
@@ -4255,9 +4253,7 @@ Resolve Intrinsic Track Sizes</h3>
42554253
Next, repeat the previous step
42564254
instead considering (together, rather than grouped by span size)
42574255
all items
4258-
that <em>do</em> span a track with both
4259-
a <a>flexible sizing function</a> and
4260-
an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>
4256+
that <em>do</em> span a track with a <a>flexible sizing function</a>
42614257
while
42624258
<ul>
42634259
<li>
@@ -4691,29 +4687,22 @@ Major Changes</h4>
46914687
to intrinsic track sizes so that
46924688
they contribute to the size of flexible tracks that have an intrinsic min
46934689
rather than being ignored.
4694-
(<a href="https://github.com/w3c/csswg-drafts/issues/2177">Issue 2177</a>,
4695-
<a href="https://github.com/w3c/csswg-drafts/issues/3705">3705</a>)
4690+
(<a href="https://github.com/w3c/csswg-drafts/issues/2177">Issue 2177</a>)
46964691
<blockquote>
46974692
<ul>
46984693
<li>
46994694
<strong>Size tracks to fit non-spanning items:</strong>
47004695
For each track with an intrinsic <a>track sizing function</a>
47014696
<ins>and not a <a>flexible sizing function</a></ins>,
4702-
consider the items in it with a span of 1: &hellip;
4697+
consider the items in it with a span of 1:
47034698
<li>
4704-
<strong>Increase sizes to accommodate spanning items crossing content-sized tracks:</strong>
4705-
Next, consider the items with a span of 2
4706-
that do not span a track with <ins>both</ins>
4707-
a <a>flexible sizing function</a> <ins>and
4708-
an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a></ins>.
4699+
&hellip;
47094700
<li>
47104701
<ins><strong>Increase sizes to accommodate spanning items crossing flexible tracks:</strong>
47114702
Next, repeat the previous step
47124703
instead considering (together, rather than grouped by span size)
47134704
all items
4714-
that <em>do</em> span a track with both
4715-
a flexible sizing function and
4716-
an intrinsic min track sizing function
4705+
that <em>do</em> span a track with a <a>flexible sizing function</a>
47174706
while
47184707
<ul>
47194708
<li>

0 commit comments

Comments
 (0)