W3C home > Mailing lists > Public > public-css-commits@w3.org > February 2012

csswg/css3-layout new.html,1.8,1.9

From: Bert Bos via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 17 Feb 2012 01:40:11 +0000
To: public-css-commits@w3.org
Message-Id: <E1RyCnz-0000Qo-Ap@lionel-hutz.w3.org>
Update of /sources/public/csswg/css3-layout
In directory hutz:/tmp/cvs-serv1644

Modified Files:
	new.html 
Log Message:
Generated. Do not edit!

Index: new.html
===================================================================
RCS file: /sources/public/csswg/css3-layout/new.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- new.html	17 Feb 2012 01:21:45 -0000	1.8
+++ new.html	17 Feb 2012 01:40:09 -0000	1.9
@@ -236,7 +236,7 @@
       </ul>
 
      <li><a href="#slot-sizes"><span class=secno>3.6. </span> Calculating the
-      widths and heights of the slots</a>
+      size of the grid</a>
 
      <li><a href="#grid-shorthand"><span class=secno>3.7. </span> The
       &lsquo;<code class=property>grid</code>&rsquo; shorthand property</a>
@@ -1437,12 +1437,12 @@
    and <var>M</var> rows, the implicit template is equivalent to <var>M</var>
    strings of <var>N</var> asterisks:
 
-  <pre>
-"***&hellip;***"
-"***&hellip;***"
-&#8942;
-"***&hellip;***"
-</pre>
+  <blockquote>
+   <p><code>"***</code>&hellip;<code>***"</code><br>
+    <code>"***</code>&hellip;<code>***"</code><br>
+    &#8942;<br>
+    <code>"***</code>&hellip;<code>***"</code>
+  </blockquote>
 
   <p class=note>Note that an element is a grid element in this case if
    &lsquo;<a href="#grid-columns"><code
@@ -1728,9 +1728,11 @@
    the template, then that slot is the default. If there is no asterisk, then
    the first letter in the template defines the default slot.
 
-  <p class=example>For example, if the template is defined by &lsquo;<code
-   class=css>grid-template: "..." "..c" "abb" "abb"</code>&rsquo;, then
-   ā€œcā€ is the default slot.
+  <div class=example>
+   <p>For example, if the template is defined by &lsquo;<code
+    class=css>grid-template: "..." "..c" "abb" "abb"</code>&rsquo;, then
+    ā€œcā€ is the default slot.
+  </div>
 
   <p>If the grid has an <a href="#implicit-template"><em>implicit
    template</em></a> (i.e., &lsquo;<a href="#grid-template"><code
@@ -1842,13 +1844,13 @@
    href="#grid-rows"><code class=property>grid-rows</code></a>&rsquo; or
    grid-columns' property.
 
-  <h3 id=slot-sizes><span class=secno>3.6. </span> Calculating the widths and
-   heights of the slots</h3>
+  <h3 id=slot-sizes><span class=secno>3.6. </span> Calculating the size of
+   the grid</h3>
 
   <p>The UA must choose the widths and heights of all columns and rows such
    that the following constraints are satisfied.
 
-  <ul>
+  <ol>
    <li>If the element has an a-priori known content height, then the sum of
     the heights of all rows must be equal to the element's height.
 
@@ -1894,15 +1896,33 @@
     horizontal padding, border and margin.
 
    <li>Each <a href="#vertical-element"><em>vertical</em></a> slot that spans
+    at least one column with a width specified as &lsquo;<code
+    class=property>max-content</code>&rsquo;, &lsquo;<code
+    class=property>min-content</code>&rsquo; or &lsquo;<code
+    class=property>fit-content</code>&rsquo;, must have a width at least as
+    large as the slot's <a href="#block-dimension"><em>block
+    dimension.</em></a>
+
+   <li>Each <a href="#horizontal-element."><em>horizontal</em></a> slot that
+    spans at least one row with a height specified as &lsquo;<code
+    class=property>max-content</code>&rsquo;, &lsquo;<code
+    class=property>min-content</code>&rsquo; or &lsquo;<code
+    class=property>fit-content</code>&rsquo;, must have a height at least as
+    large as the slot's <a href="#block-dimension"><em>block
+    dimension.</em></a>
+
+   <li>Each <a href="#vertical-element"><em>vertical</em></a> slot that spans
     at least one row with a height specified as &lsquo;<code
-    class=property>min-content</code>&rsquo; must be at least as high as the
+    class=property>min-content</code>&rsquo; or &lsquo;<code
+    class=property>fit-content</code>&rsquo; must be at least as high as the
     preferred minimum height of that slot, as defined in <a href="#CSS3BOX"
     rel=biblioentry>[CSS3BOX]<!--{{!CSS3BOX}}--></a>, plus the slot's
     vertical padding, border and margin.
 
    <li>Each <a href="#horizontal-element."><em>horizontal</em></a> slot that
-    spans at least one columns with a height specified as &lsquo;<code
-    class=property>min-content</code>&rsquo; must be at least as wide as the
+    spans at least one column with a width specified as &lsquo;<code
+    class=property>min-content</code>&rsquo; or &lsquo;<code
+    class=property>fit-content</code>&rsquo; must be at least as wide as the
     preferred minimum width of that slot, as defined in <a href="#CSS3BOX"
     rel=biblioentry>[CSS3BOX]<!--{{!CSS3BOX}}--></a>, plus the slot's
     horizontal padding, border and margin.
@@ -1928,7 +1948,7 @@
     W<sub>i</sub> * w<sub>j</sub> = W<sub>j</sub> * W<sub>i</sub>. (I.e.,
     their widths are proportional to their number of &lsquo;<code
     class=property>fr</code>&rsquo; units.)
-  </ul>
+  </ol>
 
   <p>If it is impossible to choose such widths and heights, then try without
    constraint 1. If it is still impossible, try without constraint 2 instead.
Received on Friday, 17 February 2012 01:40:13 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 17 February 2012 01:40:13 GMT