@@ -1511,7 +1511,7 @@ Explicit Track Sizing: the 'grid-template-rows' and 'grid-template-columns' prop
1511
1511
1512
1512
<dfn><track-size></dfn> = <<track-breadth>> | minmax( <<inflexible-breadth>> , <<track-breadth>> ) | fit-content( <<length-percentage [0,∞]>> )
1513
1513
<dfn><fixed-size></dfn> = <<fixed-breadth>> | minmax( <<fixed-breadth>> , <<track-breadth>> ) | minmax( <<inflexible-breadth>> , <<fixed-breadth>> )
1514
- <dfn><track-breadth></dfn> = <<length-percentage [0,∞]>> | <<flex [0,∞]>> | min-content | max-content | auto
1514
+ <dfn><track-breadth></dfn> = <<length-percentage [0,∞]>> | <<fraction [0,∞]>> | min-content | max-content | auto
1515
1515
<dfn><inflexible-breadth></dfn> = <<length-percentage [0,∞]>> | min-content | max-content | auto
1516
1516
<dfn><fixed-breadth></dfn> = <<length-percentage [0,∞]>>
1517
1517
<dfn><line-names></dfn> = '[' <<custom-ident>> * ']'
@@ -1540,10 +1540,10 @@ Track Sizes</h4>
1540
1540
and then resolve against that resulting <a>grid container</a> size
1541
1541
for the purpose of laying out the <a>grid</a> and its items.
1542
1542
1543
- <dt> <dfn><<flex [0,∞]>></dfn>
1543
+ <dt> <dfn><<fraction [0,∞]>></dfn>
1544
1544
<dd>
1545
1545
Specifies the track's <dfn dfn noexport>flex factor</dfn> .
1546
- Each <<flex >> -sized track takes a share of the remaining space in proportion to its <a>flex factor</a> .
1546
+ Each <<fraction >> -sized track takes a share of the remaining space in proportion to its <a>flex factor</a> .
1547
1547
For example, given a track listing of ''1fr 2fr'' ,
1548
1548
the tracks will take up ⅓ and ⅔ of the <a>leftover space</a> , respectively.
1549
1549
See [[#flexible-tracks]] for more details.
@@ -1553,7 +1553,7 @@ Track Sizes</h4>
1553
1553
rather than expanding to fill the entire thing.
1554
1554
1555
1555
When appearing outside a ''minmax()'' notation,
1556
- implies an automatic minimum (i.e. ''minmax(auto, <<flex >>)'' ).
1556
+ implies an automatic minimum (i.e. ''minmax(auto, <<fraction >>)'' ).
1557
1557
1558
1558
<dt> <dfn function lt="minmax()">minmax(<var>min</var>, <var>max</var>)</dfn>
1559
1559
<dd>
@@ -1563,10 +1563,10 @@ Track Sizes</h4>
1563
1563
If the <var> max</var> is less than the <var> min</var> ,
1564
1564
then the <var> max</var> will be floored by the <var> min</var>
1565
1565
(essentially yielding ''minmax(<var>min</var>, <var>min</var>)'' ).
1566
- As a maximum, a <<flex >> value sets the track's <a>flex factor</a> ;
1566
+ As a maximum, a <<fraction >> value sets the track's <a>flex factor</a> ;
1567
1567
it is invalid as a minimum.
1568
1568
1569
- Note: A future level of this spec may allow <<flex >> minimums,
1569
+ Note: A future level of this spec may allow <<fraction >> minimums,
1570
1570
and will update the <a>track sizing algorithm</a> to account for this correctly
1571
1571
1572
1572
<dt> <dfn>auto</dfn>
@@ -1648,7 +1648,7 @@ Track Sizes</h4>
1648
1648
(the ''1fr'' sizes both resolve to ''0'' ).
1649
1649
If the sum is less than the <a>grid container</a> ’s width,
1650
1650
the final <a>grid line</a> will be exactly at the end edge of the <a>grid container</a> .
1651
- This is true in general whenever there's at least one <<flex >> value among the <a>grid track</a> sizes.
1651
+ This is true in general whenever there's at least one <<fraction >> value among the <a>grid track</a> sizes.
1652
1652
</div>
1653
1653
1654
1654
<div class='example'>
@@ -1862,9 +1862,11 @@ Interpolation/Combination of ''repeat()''</h5>
1862
1862
<h4 id='flexible-tracks'>
1863
1863
Flexible Tracks</h4>
1864
1864
1865
- Tracks sized using <<flex>> values are called <dfn>flexible tracks</dfn>
1865
+ Tracks sized using a <<fraction>> of the <a>leftover space</a>
1866
+ are called <dfn>flexible tracks</dfn>
1866
1867
as they flex in response to <a>leftover space</a>
1867
- similar to how <a>flex items</a> with a zero base size fill space in a <a>flex container</a> .
1868
+ similar to how <a>flex items</a> with a zero base size
1869
+ fill space in a <a>flex container</a> .
1868
1870
1869
1871
The distribution of <a>leftover space</a> occurs after all non-flexible <a>track sizing functions</a> have reached their maximum.
1870
1872
The total size of such rows or columns is subtracted from the available space, yielding the <a>leftover space</a> ,
@@ -3576,7 +3578,7 @@ Inline-axis Alignment: the 'justify-self' and 'justify-items' properties</h3>
3576
3578
that item does not participate in baseline alignment,
3577
3579
and instead uses its <a>fallback alignment</a>
3578
3580
as if that were originally specified.
3579
- For this purpose, <<flex >> track sizes count as “intrinsically-sized”
3581
+ For this purpose, <<fraction >> track sizes count as “intrinsically-sized”
3580
3582
when the [=grid container=] has an [=indefinite=] size in the relevant axis.
3581
3583
3582
3584
Note: Whether the fallback alignment is used or not
@@ -3599,7 +3601,7 @@ Block-axis Alignment: the 'align-self' and 'align-items' properties</h3>
3599
3601
that item does not participate in baseline alignment,
3600
3602
and instead uses its <a>fallback alignment</a>
3601
3603
as if that were originally specified.
3602
- For this purpose, <<flex >> track sizes count as “intrinsically-sized”
3604
+ For this purpose, <<fraction >> track sizes count as “intrinsically-sized”
3603
3605
when the [=grid container=] has an [=indefinite=] size in the relevant axis.
3604
3606
3605
3607
<h3 id='grid-align'>
@@ -3757,7 +3759,7 @@ Grid Sizing</h2>
3757
3759
<ul>
3758
3760
<li> A <dfn>fixed sizing function</dfn> (<<length>> or resolvable <<percentage>> ).
3759
3761
<li> An <dfn>intrinsic sizing function</dfn> (''min-content'' , ''max-content'' , ''grid-template-rows/auto'' , ''fit-content()'' ).
3760
- <li> A <dfn>flexible sizing function</dfn> (<<flex >> ).
3762
+ <li> A <dfn>flexible sizing function</dfn> (<<fraction >> ).
3761
3763
</ul>
3762
3764
3763
3765
The <a>grid sizing algorithm</a> defines how to resolve these sizing constraints into used track sizes.
@@ -3801,7 +3803,7 @@ Grid Sizing Algorithm</h3>
3801
3803
<li>
3802
3804
infinity, if any track that it spans
3803
3805
has a ''max-content'' min sizing function
3804
- or a ''max-content'' , ''auto'' , or <<flex >> max sizing function.
3806
+ or a ''max-content'' , ''auto'' , or <<fraction >> max sizing function.
3805
3807
</ul>
3806
3808
3807
3809
This is may reduce the amount of re-layout passes that are necessary,
@@ -3886,7 +3888,7 @@ Track Sizing Terminology</h3>
3886
3888
<dd>
3887
3889
If the track was sized with a ''minmax()'' function,
3888
3890
this is the first argument to that function.
3889
- If the track was sized with a <<flex >> value or ''fit-content()'' function,
3891
+ If the track was sized with a <<fraction >> value or ''fit-content()'' function,
3890
3892
''auto'' .
3891
3893
Otherwise, the track's sizing function.
3892
3894
@@ -4857,7 +4859,7 @@ Changes since the <a href="https://www.w3.org/TR/2020/CRD-css-grid-1-20201218/">
4857
4859
</blockquote>
4858
4860
4859
4861
<li id="change-2020-fr-unit">
4860
- Moved the definition of <<flex >> to [[css-values-4#fractions]] ,
4862
+ Moved the definition of <<fraction >> to [[css-values-4#fractions]] ,
4861
4863
as other specs also make use of it.
4862
4864
(<a href="https://github.com/w3c/csswg-drafts/issues/8027">Issue 8027</a> )
4863
4865
</ul>
@@ -5553,7 +5555,7 @@ Major Changes</h4>
5553
5555
when <<percentage>> sizes are used
5554
5556
in <a lt="fit-content size">fit-content</a> -sized <a>grid containers</a>
5555
5557
such as ''width/auto'' -sized inline or floated <a>grid containers</a> .
5556
- (To avoid this problem, use <<flex >> units instead,
5558
+ (To avoid this problem, use <<fraction >> units instead,
5557
5559
which are intended to maintain their ratios and not overflow
5558
5560
when the grid is intrinsically-sized.)
5559
5561
<blockquote>
0 commit comments