8000 merge · w3c/csswg-drafts@726065e · GitHub
Skip to content

Commit 726065e

Browse files
author
Peter Linss
committed
merge
2 parents c399132 + d7e7176 commit 726065e

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

css-sizing/Overview.bs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ New Keywords for 'width' and 'height'</h3>
240240
are represented in the width and height properties by the keywords
241241
defined above):
242242

243-
<dl dfn-type=value dfn-for="width min-width max-width height min-height max-height">
243+
<dl dfn-type=value dfn-for="width, min-width, max-width, height, min-height, max-height">
244244
<dt><dfn>fill</dfn>
245245
<dd>
246246
Use the <a>fill-available inline size</a> or <a>fill-available block size</a>,
@@ -300,7 +300,7 @@ Containing Floats</h3>
300300
</pre>
301301

302302
<dl>
303-
<dt><dfn for="min-width min-height" value>contain-floats</dfn>
303+
<dt><dfn for="min-width, min-height" value>contain-floats</dfn>
304304
<dd>
305305
Equivalent to ''min-width/min-content''
306306
except that when applied to the block-size of a block box
@@ -359,9 +359,9 @@ Intrinsic Sizes of Replaced Elements</h3>
359359
calculated with an unconstrained specified size.
360360

361361
The <a>min-content contribution</a> and <a>max-content contribution</a> in each axis
362-
is the element's specified outer size in that axis, if definite,
363-
and the <a>min-content size</a>, as specified above, plus the element's margin/border/padding in that axis otherwise,
364-
clamped by the element's min and max size properties in that axis.
362+
is the element's specified outer size in that axis, if definite,
363+
and the <a>min-content size</a>, as specified above, plus the element's margin/border/padding in that axis otherwise,
364+
clamped by the element's min and max size properties in that axis.
365365

366366
<h3 id='inline-intrinsic'>
367367
Intrinsic Sizes of Non-Replaced Inlines</h3>
@@ -454,16 +454,16 @@ Intrinsic Sizes in Table Layout</h3>
454454
Intrinsic Sizes in Multi-column Layout</h3>
455455

456456
<p>
457-
The <a>min-content inline size</a> of a multi-column element
457+
The <i>min-content inline-size</i> of a multi-column element
458458
with a computed 'column-width' not ''column-width/auto''
459459
is the smaller of
460460
its 'column-width'
461461
and the largest <a>min-content inline-size contribution</a> of its contents.
462462

463463
<p>
464-
The <a>min-content inline size</a> of a multi-column element
464+
The <i>min-content inline-size</i> of a multi-column element
465465
with a computed 'column-width' of ''column-width/auto''
466-
is the largest <a>min-content inline-size contribution</a> of its contents
466+
is the largest <i>min-content inline-size contribution</i> of its contents
467467
multiplied by its 'column-count'
468468
(treating ''column-count/auto'' as ''1'').
469469

@@ -473,8 +473,8 @@ Intrinsic Sizes in Multi-column Layout</h3>
473473
and a computed 'column-count' not ''column-count/auto''
474474
is its 'column-count'
475475
multiplied by the larger of
476-
its 'column-width' (treating ''column-width/auto'' as zero)
477-
and the largest <a>max-content inline-size contribution</a> of its contents.
476+
its 'column-width' (treating ''column-width/auto'' as 0)
477+
and the largest <i>max-content inline-size contribution</i> of its contents.
478478

479479
<p>
480480
The <a>max-content inline size</a> of a multi-column element
@@ -486,7 +486,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
486486
<!--
487487
The above was decided based on dholbert's example in http://lists.w3.org/Archives/Public/www-style/2012Oct/0017.html .
488488
These definitions make multicols work well in flexbox,
489-
both in 'stretch' and non-'stretch' cases,
489+
both in ''stretch'' and non-''stretch'' cases,
490490
without wasted space or needless overflow.
491491
-->
492492

@@ -498,7 +498,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
498498

499499
<ul>
500500
<li>
501-
Laying out the element with column-spanning elements given 'display: none',
501+
Laying out the element with column-spanning elements given ''display: none'',
502502
and taking a inline-size that includes all the columns.
503503

504504
<li>
@@ -525,7 +525,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
525525
and measuring the resulting columns.
526526

527527
<p>
528-
The <a>preferred inline size</a> of a multi-column element
528+
The <i>preferred inline-size</i> of a multi-column element
529529
with non-''column-width/auto'' 'column-width' and 'column-count'
530530
is the product of the 'column-width' and 'column-count',
531531
plus the appropriate amount of column gaps.
@@ -555,7 +555,7 @@ Fill-available Sizing</h3>
555555
and where the first value is used if it is <a>definite</a> and the second value otherwise.
556556
</ul>
557557
<p>
558-
&hellip;less the box's <a>inline-axis</a> margins
558+
&hellip;less the box's <i>inline-axis</i> margins
559559
(after any <a href="http://www.w3.org/TR/CSS21/box.html#collapsing-margins">margin collapsing</a>, and treating ''margin/auto'' margins as zero),
560560
borders, and padding.
561561

0 commit comments

Comments
 (0)