Skip to content

Commit 742d6bc

Browse files
committed
Generated. Do not edit!
1 parent dcbb207 commit 742d6bc

1 file changed

Lines changed: 37 additions & 17 deletions

File tree

css3-layout/new.html

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
236236
</ul>
237237

238238
<li><a href="#slot-sizes"><span class=secno>3.6. </span> Calculating the
239-
widths and heights of the slots</a>
239+
size of the grid</a>
240240

241241
<li><a href="#grid-shorthand"><span class=secno>3.7. </span> The
242242
&lsquo;<code class=property>grid</code>&rsquo; shorthand property</a>
@@ -1437,12 +1437,12 @@ <h3 id=grid-templates><span class=secno>3.2. </span> Declaring a template:
14371437
and <var>M</var> rows, the implicit template is equivalent to <var>M</var>
14381438
strings of <var>N</var> asterisks:
14391439

1440-
<pre>
1441-
"***&hellip;***"
1442-
"***&hellip;***"
1443-
&#8942;
1444-
"***&hellip;***"
1445-
</pre>
1440+
<blockquote>
1441+
<p><code>"***</code>&hellip;<code>***"</code><br>
1442+
<code>"***</code>&hellip;<code>***"</code><br>
1443+
&#8942;<br>
1444+
<code>"***</code>&hellip;<code>***"</code>
1445+
</blockquote>
14461446

14471447
<p class=note>Note that an element is a grid element in this case if
14481448
&lsquo;<a href="#grid-columns"><code
@@ -1728,9 +1728,11 @@ <h3 id=default-slots><span class=secno>3.5. </span>Default slots</h3>
17281728
the template, then that slot is the default. If there is no asterisk, then
17291729
the first letter in the template defines the default slot.
17301730

1731-
<p class=example>For example, if the template is defined by &lsquo;<code
1732-
class=css>grid-template: "..." "..c" "abb" "abb"</code>&rsquo;, then
1733-
“c” is the default slot.
1731+
<div class=example>
1732+
<p>For example, if the template is defined by &lsquo;<code
1733+
class=css>grid-template: "..." "..c" "abb" "abb"</code>&rsquo;, then
1734+
“c” is the default slot.
1735+
</div>
17341736

17351737
<p>If the grid has an <a href="#implicit-template"><em>implicit
17361738
template</em></a> (i.e., &lsquo;<a href="#grid-template"><code
@@ -1842,13 +1844,13 @@ <h4 id=computed-values-grid-rows-and-columns><span class=secno>3.5.2.
18421844
href="#grid-rows"><code class=property>grid-rows</code></a>&rsquo; or
18431845
grid-columns' property.
18441846

1845-
<h3 id=slot-sizes><span class=secno>3.6. </span> Calculating the widths and
1846-
heights of the slots</h3>
1847+
<h3 id=slot-sizes><span class=secno>3.6. </span> Calculating the size of
1848+
the grid</h3>
18471849

18481850
<p>The UA must choose the widths and heights of all columns and rows such
18491851
that the following constraints are satisfied.
18501852

1851-
<ul>
1853+
<ol>
18521854
<li>If the element has an a-priori known content height, then the sum of
18531855
the heights of all rows must be equal to the element's height.
18541856

@@ -1893,16 +1895,34 @@ <h3 id=slot-sizes><span class=secno>3.6. </span> Calculating the widths and
18931895
rel=biblioentry>[CSS3BOX]<!--{{!CSS3BOX}}--></a>, plus the slot's
18941896
horizontal padding, border and margin.
18951897

1898+
<li>Each <a href="#vertical-element"><em>vertical</em></a> slot that spans
1899+
at least one column with a width specified as &lsquo;<code
1900+
class=property>max-content</code>&rsquo;, &lsquo;<code
1901+
class=property>min-content</code>&rsquo; or &lsquo;<code
1902+
class=property>fit-content</code>&rsquo;, must have a width at least as
1903+
large as the slot's <a href="#block-dimension"><em>block
1904+
dimension.</em></a>
1905+
1906+
<li>Each <a href="#horizontal-element."><em>horizontal</em></a> slot that
1907+
spans at least one row with a height specified as &lsquo;<code
1908+
class=property>max-content</code>&rsquo;, &lsquo;<code
1909+
class=property>min-content</code>&rsquo; or &lsquo;<code
1910+
class=property>fit-content</code>&rsquo;, must have a height at least as
1911+
large as the slot's <a href="#block-dimension"><em>block
1912+
dimension.</em></a>
1913+
18961914
<li>Each <a href="#vertical-element"><em>vertical</em></a> slot that spans
18971915
at least one row with a height specified as &lsquo;<code
1898-
class=property>min-content</code>&rsquo; must be at least as high as the
1916+
class=property>min-content</code>&rsquo; or &lsquo;<code
1917+
class=property>fit-content</code>&rsquo; must be at least as high as the
18991918
preferred minimum height of that slot, as defined in <a href="#CSS3BOX"
19001919
rel=biblioentry>[CSS3BOX]<!--{{!CSS3BOX}}--></a>, plus the slot's
19011920
vertical padding, border and margin.
19021921

19031922
<li>Each <a href="#horizontal-element."><em>horizontal</em></a> slot that
1904-
spans at least one columns with a height specified as &lsquo;<code
1905-
class=property>min-content</code>&rsquo; must be at least as wide as the
1923+
spans at least one column with a width specified as &lsquo;<code
1924+
class=property>min-content</code>&rsquo; or &lsquo;<code
1925+
class=property>fit-content</code>&rsquo; must be at least as wide as the
19061926
preferred minimum width of that slot, as defined in <a href="#CSS3BOX"
19071927
rel=biblioentry>[CSS3BOX]<!--{{!CSS3BOX}}--></a>, plus the slot's
19081928
horizontal padding, border and margin.
@@ -1928,7 +1948,7 @@ <h3 id=slot-sizes><span class=secno>3.6. </span> Calculating the widths and
19281948
W<sub>i</sub> * w<sub>j</sub> = W<sub>j</sub> * W<sub>i</sub>. (I.e.,
19291949
their widths are proportional to their number of &lsquo;<code
19301950
class=property>fr</code>&rsquo; units.)
1931-
</ul>
1951+
</ol>
19321952

19331953
<p>If it is impossible to choose such widths and heights, then try without
19341954
constraint 1. If it is still impossible, try without constraint 2 instead.

0 commit comments

Comments
 (0)