Skip to content

Commit 3ed0b2e

Browse files
committed
[css-grid-3][masonry][editorial] Align placement terminology with CSS Grid specs.
1 parent ffda3a6 commit 3ed0b2e

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

css-grid-3/Overview.bs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ Subgrids</h3>
564564

565565
Note how the subgrid's first item ("subgrid.1") contributes
566566
to the intrinsic size of the 2nd row in the parent grid.
567-
This is possible since the subgrid specified a definite placement
567+
This is possible since the subgrid specified a definite position
568568
so we know which tracks it will occupy.
569569
Note also that trying to subgrid the parent's [=masonry axis=]
570570
results in the subgrid getting [=masonry layout=] in its [=inline axis=].
@@ -629,20 +629,20 @@ Grid Axis Track Sizing</h3>
629629
Track sizing works the same as in [[css-grid-2#algo-track-sizing|CSS Grid]],
630630
except that when considering which items contribute to intrinsic sizes:
631631
* All items explicitly placed in that track contribute, and
632-
* All items without an explicit placement contribute
632+
* All items with an [=automatic grid position=] contribute
633633
(regardless of whether they are ultimately placed in that track).
634634

635635
<div class="example">
636636
For example, suppose there are two columns in the [=grid axis=]
637637
and that
638-
* Items A, B, and C have no explicit placement.
638+
* Items A, B, and C have no explicit position.
639639
* Item D is explicitly placed into the first column.
640640

641641
In this case, items A, B, C, and D all contribute to sizing the first column,
642642
while only A, B, and C (and not D) contribute to the second column.
643643
</div>
644644

645-
In the case of spanning items with no explicit placement,
645+
In the case of spanning items with an [=automatic grid position=],
646646
they are assumed to be placed at every possible start position,
647647
and contribute accordingly.
648648

@@ -680,8 +680,9 @@ Masonry Placement</h3>
680680

681681
In the [=grid axis=],
682682
items can be <em>explicitly placed</em> into tracks and span them using the familiar [=grid-placement properties=]’ syntax.
683-
[=Auto-placement=], however, uses the [[#masonry-layout-algorithm]],
684-
placing each item into the “shortest” masonry track available.
683+
Auto-placement, however, uses the [[#masonry-layout-algorithm]],
684+
placing each item with an [=automatic grid position=]
685+
into the “shortest” masonry track available.
685686

686687
<div class="example">
687688
Here's a masonry layout <a href="examples/pinterest-with-span.html">example</a>
@@ -772,12 +773,12 @@ Masonry Layout and Placement Algorithm</h3>
772773
For each item in [=order-modified document order=]:
773774
<ol>
774775
<li>
775-
If the item has an definite placement in the [=grid axis=],
776+
If the item has a [=definite grid position=] in the [=grid axis=],
776777
use that placement.
777778

778779
ISSUE: Should this also update the placement cursor?
779780

780-
Otherwise, resolve its [=grid axis=] placement using these substeps:
781+
Otherwise, resolve its [=grid axis=] placement using these substeps:
781782

782783
<ol>
783784
<li>Starting at the first [=grid axis=] line in the [=implicit grid=],
@@ -789,7 +790,7 @@ Otherwise, resolve its [=grid axis=] placement using these substeps:
789790
<li>Let |possible lines| be the line that resulted in the smallest <var>max_pos</var>,
790791
and all lines that result in a <var>max_pos</var> within the [=tie threshold=] of this <var>max_pos</var>.
791792
<li>Choose the first line in |possible lines| greater than or equal to the [=auto-placement cursor=]
792-
as the item's definite placement in the [=grid axis=];
793+
as the item's position in the [=grid axis=];
793794
or if there are none such, choose the first one.
794795
<li>Update the [=auto-placement cursor=] to point to item's last line.
795796
</ol>

0 commit comments

Comments
 (0)