Skip to content

Commit d178a52

Browse files
tabatkinstabatkins
committed
git merging
1 parent 6ac4972 commit d178a52

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed

‎css-align-3/Overview.bs

+27-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ spec:css-multicol-1; type:dfn;
4141
text:column box
4242
spec:css-overflow-3; type:dfn; text:scroll container
4343
spec:css-position-3; type:property; text:left
44-
spec:css-writing-modes-3; type:dfn; text:dominant baseline
44+
spec:css-writing-modes-3; type:dfn;
45+
text:dominant baseline
46+
text:start
47+
text:end
4548
spec:selectors-3; type:dfn; text:first formatted line
4649
spec:css2; type:dfn; text:line box
4750
</pre>
@@ -380,12 +383,14 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
380383

381384
<figure>
382385
<img src="images/start-inline-tb.svg"
386+
width="199" height="125"
383387
style="background: white; padding: 8px;"
384388
title="inline-axis 'start' alignment in various writing systems"
385389
alt="Inline-axis 'start' alignment:
386390
Horizontal Latin and Chinese are left-aligned,
387391
while Arabic and Hebrew are right-aligned.">
388392
<img src="images/end-inline-tb.svg"
393+
width="199" height="125"
389394
style="background: white; padding: 8px;"
390395
title="inline-axis 'end' alignment in various writing systems"
391396
alt="Inline-axis 'end' alignment:
@@ -402,11 +407,13 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
402407

403408
<figure>
404409
<img src="images/left-inline-tb.svg"
410+
width="175" height="125"
405411
style="background: white; padding: 8px;"
406412
title="'left' alignment in various writing systems"
407413
alt="Inline-axis 'left' alignment:
408414
Horizontal text is left-aligned, regardless of writing system.">
409415
<img src="images/right-inline-tb.svg"
416+
width="176" height="125"
410417
style="background: white; padding: 8px;"
411418
title="'right' alignment in various writing systems"
412419
alt="Inline-axis 'right' alignment:
@@ -424,11 +431,13 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
424431

425432
<figure>
426433
<img src="images/start-block-tb.svg"
434+
width="183" height="125"
427435
style="background: white; padding: 8px; padding-bottom: calc(8px + 23px);"
428436
title="block-axis 'start' alignment in various writing systems"
429437
alt="Block-axis 'start' alignment:
430438
Horizontal text is top-aligned in the vertical axis.">
431439
<img src="images/end-block-tb.svg"
440+
width="183" height="125"
432441
style="background: white; padding: 8px; padding-top: calc(8px + 23px);"
433442
title="block-axis 'end' alignment in various writing systems"
434443
alt="Block-axis 'bottom' alignment:
@@ -447,13 +456,15 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
447456

448457
<figure>
449458
<img src="images/self-v-context-start-tb.svg"
459+
width="204" height="193"
450460
style="background: white; padding: 8px;"
451461
title="inline-axis 'start' alignment with LTR context"
452462
alt="Inline-axis 'start' alignment in an LTR container:
453463
Alignment uses the context’s start direction, so
454464
the (RTL) Arabic and Hebrew items
455465
are left-aligned alongside the (LTR) Latin and Chinese.">
456466
<img src="images/self-v-context-self-start-tb.svg"
467+
width="229" height="193"
457468
style="background: white; padding: 8px;"
458469
title="inline-axis 'self-start' alignment with LTR context"
459470
alt="Inline-axis 'self-start' alignment in an LTR container:
@@ -475,12 +486,14 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
475486

476487
<figure>
477488
<img src="images/start-inline-rl.svg"
489+
width="125" height="200"
478490
style="background: white; padding: 8px;"
479491
title="inline-axis 'start' alignment in various writing systems"
480492
alt="Inline-axis 'start' alignment in vertical-rl writing:
481493
Vertical Latin and Chinese are top-aligned,
482494
while Arabic and Hebrew are bottom-aligned.">
483495
<img src="images/end-inline-rl.svg"
496+
width="125" height="200"
484497
style="background: white; padding: 8px;"
485498
title="inline-axis 'end' alignment in various writing systems"
486499
alt="Inline-axis 'end' alignment in vertical-rl writing:
@@ -494,11 +507,13 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
494507

495508
<figure>
496509
<img src="images/left-inline-rl.svg"
510+
width="126" height="174"
497511
style="background: white; padding: 8px; padding-bottom: calc(8px + 23px);"
498512
title="'left' alignment in various writing systems"
499513
alt="Inline-axis 'left' alignment in vertical-rl writing:
500514
Vertical text is top-aligned, regardless of writing system.">
501515
<img src="images/right-inline-rl.svg"
516+
width="125" height="180"
502517
style="background: white; padding: 8px; padding-top: calc(5px + 23px); padding-bottom: 5px;"
503518
title="'right' alignment in various writing systems"
504519
alt="Inline-axis 'right' alignment in vertical-rl writing:
@@ -510,11 +525,13 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
510525

511526
<figure>
512527
<img src="images/start-block-rl.svg"
528+
width="123" height="183"
513529
style="background: white; padding: 8px;"
514530
title="block-axis 'start' alignment in various writing systems"
515531
alt="Block-axis 'start' alignment in vertical-rl writing:
516532
Vertical text is top-aligned in the vertical axis.">
517533
<img src="images/end-block-rl.svg"
534+
width="125" height="183"
518535
style="background: white; padding: 8px;"
519536
title="block-axis 'end' alignment in various writing systems"
520537
alt="Block-axis 'bottom' alignment in vertical-rl writing:
@@ -527,13 +544,15 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
527544

528545
<figure>
529546
<img src="images/self-v-context-start-rl.svg"
547+
width="162" height="210"
530548
style="background: white; padding: 8px; padding-bottom: calc(8px + 30px);"
531549
title="inline-axis 'start' alignment with LTR context"
532550
alt="Inline-axis 'start' alignment in a vertical-rl LTR container:
533551
Alignment uses the context’s start direction, so
534552
the (RTL) Arabic and Hebrew items
535553
are top-aligned alongside the (LTR) Latin and Chinese.">
536554
<img src="images/self-v-context-self-start-rl.svg"
555+
width="162" height="240"
537556
style="background: white; padding: 8px;"
538557
title="inline-axis 'self-start' alignment with LTR context"
539558
alt="Inline-axis 'self-start' alignment in a vertical-rl LTR container:
@@ -671,7 +690,7 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
671690
to disperse a container’s extra space among its <a>alignment subjects</a>.
672691

673692
<figure>
674-
<img src="images/distribute.svg" alt="space-between | space-around | space-evenly | stretch">
693+
<img src="images/distribute.svg" alt="space-between | space-around | space-evenly | stretch" width="504" height="218">
675694
<figcaption>The <a>distributed alignment</a> values</figcaption>
676695
</figure>
677696

@@ -690,6 +709,7 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
690709

691710
<figure>
692711
<img src="images/space-between.svg"
712+
width="504" height="56"
693713
alt="For example, given three items, all excess space is split in two and distributed: one half between the first two and one half between the last two items.">
694714
</figure>
695715

@@ -705,6 +725,7 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
705725

706726
<figure>
707727
<img src="images/space-around.svg"
728+
width="504" height="56"
708729
alt="For example, given three items, all excess space is split into sixths and distributed: one sixth at the start, one at the end, and two sixths (one third) each between the first two and between the last two items.">
709730
</figure>
710731

@@ -721,6 +742,7 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
721742

722743
<figure>
723744
<img src="images/space-evenly.svg"
745+
width="504" height="56"
724746
alt="For example, given three items, all excess space is split into fourths and distributed: to the start, to the end, to between the first two, and to between the last two items.">
725747
</figure>
726748

@@ -736,6 +758,7 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
736758

737759
<figure>
738760
<img src="images/space-stretch.svg"
761+
width="504" height="56"
739762
alt="For example, given three items, all excess space is split into thirds and distributed: one third to each item.">
740763
</figure>
741764

@@ -868,7 +891,7 @@ Overflow Alignment: the ''safe'' and ''unsafe'' keywords and scroll safety limit
868891
<h2 id='content-distribution'>
869892
Content Distribution: Aligning a Box’s Contents Within Itself</h2>
870893

871-
<dfn export id="content-distribute">Content distribution</dfn> controls alignment of the box's content within its content box.
894+
<dfn export id="content-distribute" lt="content distribution | content-distribution">Content distribution</dfn> controls alignment of the box's content within its content box.
872895
It is specified by the <dfn export>content-distribution properties</dfn> 'align-content' and 'justify-content'
873896
(and their 'place-content' shorthand).
874897

@@ -1206,7 +1229,7 @@ Baseline Content-Alignment</h3>
12061229
That is, the box’s [=start=] ([=end=]) [=margin edge=]
12071230
must be intended to align--
12081231
and actually align--
1209-
to the corresponding [=edge=] of its [=containing block=]
1232+
to the corresponding [=box edge|edge=] of its [=containing block=]
12101233
when its [=baseline alignment preference=] is “first” (“last”).
12111234
It otherwise takes its <a>fallback alignment</a>.
12121235

0 commit comments

Comments
 (0)