Skip to content

Commit 5d051d9

Browse files
committed
[css-grid] Define 'grid sizing algorithm' as the general term, so 'track sizing algorithm' properly refers to what's already defined in the spec.
1 parent 7ce466b commit 5d051d9

2 files changed

Lines changed: 18 additions & 8 deletions

File tree

css-grid/Overview.bs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2564,7 +2564,11 @@ Grid Baselines</h3>
25642564

25652565

25662566
<h2 id='layout-algorithm'>
2567-
Track Sizing Algorithm</h2>
2567+
Grid Sizing Algorithm</h2>
2568+
2569+
This section defines the <dfn export>grid sizing algorithm</dfn>,
2570+
which determines the size of all <a>grid tracks</a>
2571+
and, by extension, the entire grid.
25682572

25692573
<h3 id='algo-terms'>
25702574
Definition of Terms for use in Calculating Grid Track Sizes</h3>
@@ -2615,7 +2619,7 @@ Overall Sizing Algorithm</h3>
26152619
<li>A <dfn>flexible sizing function</dfn> (<<flex>>).
26162620
</ul>
26172621

2618-
The grid layout algorithm defines how to resolve these sizing constraints into used track sizes.
2622+
The <a>grid sizing algorithm</a> defines how to resolve these sizing constraints into used track sizes.
26192623

26202624
<ol>
26212625
<li>

css-grid/Overview.html

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ <h2 class="no-num no-toc no-ref heading settled" id="contents"><span class="cont
991991
</ul>
992992
</li>
993993
<li><a href="#layout-algorithm"><span class="secno">10</span> <span class="content">
994-
Track Sizing Algorithm</span></a>
994+
Grid Sizing Algorithm</span></a>
995995
<ul class="toc">
996996
<li><a href="#algo-terms"><span class="secno">10.1</span> <span class="content">
997997
Definition of Terms for use in Calculating Grid Track Sizes</span></a></li>
@@ -3292,7 +3292,7 @@ <h2 class="heading settled" data-level="8" id="placement"><span class="secno">8.
32923292
within which the alignment properties (<a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-justify-self">justify-self</a> and <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-align-self">align-self</a>) determine their actual position.
32933293
The cells that a <a data-link-type="dfn" href="#grid-item">grid item</a> occupies also influence the sizing of the grid’s rows and columns,
32943294
defined in <a data-section="" href="#layout-algorithm">§10
3295-
Track Sizing Algorithm</a>.</p>
3295+
Grid Sizing Algorithm</a>.</p>
32963296

32973297

32983298
<p>The location of a <a data-link-type="dfn" href="#grid-item">grid item’s</a> <a data-link-type="dfn" href="#grid-area">grid area</a> within the <a data-link-type="dfn" href="#grid">grid</a>
@@ -4398,7 +4398,7 @@ <h3 class="heading settled" data-level="9.1" id="auto-margins"><span class="secn
43984398

43994399
<p><em>This section is non-normative.
44004400
The normative definition of how margins affect grid items is in <a data-section="" href="#layout-algorithm">§10
4401-
Track Sizing Algorithm</a>.</em></p>
4401+
Grid Sizing Algorithm</a>.</em></p>
44024402

44034403

44044404
<p>Auto margins on <a data-link-type="dfn" href="#grid-item">grid items</a> have an effect very similar to auto margins in block flow:</p>
@@ -4560,7 +4560,12 @@ <h3 class="heading settled" data-level="9.5" id="grid-baselines"><span class="se
45604560

45614561

45624562
<h2 class="heading settled" data-level="10" id="layout-algorithm"><span class="secno">10. </span><span class="content">
4563-
Track Sizing Algorithm</span><a class="self-link" href="#layout-algorithm"></a></h2>
4563+
Grid Sizing Algorithm</span><a class="self-link" href="#layout-algorithm"></a></h2>
4564+
4565+
4566+
<p>This section defines the <dfn data-dfn-type="dfn" data-export="" id="grid-sizing-algorithm">grid sizing algorithm<a class="self-link" href="#grid-sizing-algorithm"></a></dfn>,
4567+
which determines the size of all <a data-link-type="dfn" href="#grid-track">grid tracks</a>
4568+
and, by extension, the entire grid.</p>
45644569

45654570

45664571
<h3 class="heading settled" data-level="10.1" id="algo-terms"><span class="secno">10.1. </span><span class="content">
@@ -4635,7 +4640,7 @@ <h3 class="heading settled" data-level="10.2" id="algo-overview"><span class="se
46354640
</ul>
46364641

46374642

4638-
<p>The grid layout algorithm defines how to resolve these sizing constraints into used track sizes.</p>
4643+
<p>The <a data-link-type="dfn" href="#grid-sizing-algorithm">grid sizing algorithm</a> defines how to resolve these sizing constraints into used track sizes.</p>
46394644

46404645

46414646
<ol>
@@ -5108,7 +5113,7 @@ <h3 class="heading settled" data-level="11.1" id="fragmentation-alg"><span class
51085113

51095114
<li>
51105115
Layout the grid following the <a data-section="" href="#layout-algorithm">§10
5111-
Track Sizing Algorithm</a> by using the
5116+
Grid Sizing Algorithm</a> by using the
51125117
fragmentainer box width and assume unlimited height. During this step all <a class="property" data-link-type="propdesc" href="#propdef-grid-row">grid-row</a>
51135118
<a class="css" data-link-type="maybe" href="#valdef-grid-template-columns-grid-template-rows-auto">auto</a> and <span class="css">fr</span> values must be resolved.
51145119

@@ -5744,6 +5749,7 @@ <h2 class="no-num heading settled" id="index"><span class="content">Index</span>
57445749
<li>grid-row-end, <a href="#propdef-grid-row-end" title="section 8.2">8.2</a></li>
57455750
<li>grid row line, <a href="#grid-line" title="section 2.2">2.2</a></li>
57465751
<li>grid-row-start, <a href="#propdef-grid-row-start" title="section 8.2">8.2</a></li>
5752+
<li>grid sizing algorithm, <a href="#grid-sizing-algorithm" title="section 10">10</a></li>
57475753
<li>grid span, <a href="#grid-span" title="section 8">8</a></li>
57485754
<li>grid-template, <a href="#propdef-grid-template" title="section 5.3">5.3</a></li>
57495755
<li>grid-template-areas, <a href="#propdef-grid-template-areas" title="section 5.2">5.2</a></li>

0 commit comments

Comments
 (0)