Mercurial > drafts / changeset

     1.1 --- a/css-grid/Overview.bs	Fri Apr 18 20:44:22 2014 +0900
     1.2 +++ b/css-grid/Overview.bs	Fri Apr 18 08:57:03 2014 -0700
     1.3 @@ -1110,7 +1110,9 @@
     1.4  <h4 id='resolved-track-list'>
     1.5  Resolved Values</h4>
     1.6  
     1.7 -	The <a href="http://www.w3.org/TR/cssom/#resolved-values">resolved value</a> of the 'grid-template-rows' and 'grid-template-columns' properties is the used value,
     1.8 +	When an element's 'display' is ''grid'' or ''inline-grid'' and it generates a box,
     1.9 +	the <a href="http://www.w3.org/TR/cssom/#resolved-values">resolved value</a>
    1.10 +	of the 'grid-template-rows' and 'grid-template-columns' properties is the used value,
    1.11  	serialized as follows:
    1.12  
    1.13  	<ul>
    1.14 @@ -1127,6 +1129,9 @@
    1.15  			may be serialized with the ''repeat()'' notation.
    1.16  	</ul>
    1.17  
    1.18 +	Otherwise, (e.g. when the element has ''display: none'' or is not a grid)
    1.19 +	the resolved value is simply the computed value.
    1.20 +
    1.21  	<div class="example">
    1.22  		<pre>
    1.23  			&lt;style>

     2.1 --- a/css-grid/Overview.html	Fri Apr 18 20:44:22 2014 +0900
     2.2 +++ b/css-grid/Overview.html	Fri Apr 18 08:57:03 2014 -0700
     2.3 @@ -1219,7 +1219,9 @@
     2.4  <h4 class="heading settled heading" data-level=5.1.5 id=resolved-track-list><span class=secno>5.1.5 </span><span class=content>
     2.5  Resolved Values</span><a class=self-link href=#resolved-track-list></a></h4>
     2.6  
     2.7 -<p>	The <a href=http://www.w3.org/TR/cssom/#resolved-values>resolved value</a> of the <a class=property data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>grid-template-rows</a> and <a class=property data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>grid-template-columns</a> properties is the used value,
     2.8 +<p>	When an element’s <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visuren.html#propdef-display title=display>display</a> is <a class=css data-link-type=maybe href=#valuedef-grid title=grid>grid</a> or <a class=css data-link-type=maybe href=#valuedef-inline-grid title=inline-grid>inline-grid</a> and it generates a box,
     2.9 +	the <a href=http://www.w3.org/TR/cssom/#resolved-values>resolved value</a>
    2.10 +	of the <a class=property data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>grid-template-rows</a> and <a class=property data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>grid-template-columns</a> properties is the used value,
    2.11  	serialized as follows:
    2.12  
    2.13  <p>	<ul>
    2.14 @@ -1236,6 +1238,9 @@
    2.15  			may be serialized with the <a class=css data-link-type=maybe href=#funcdef-repeat title=repeat()>repeat()</a> notation.
    2.16  	</ul>
    2.17  
    2.18 +<p>	Otherwise, (e.g. when the element has <a class=css data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visuren.html#propdef-display title=display>display: none</a> or is not a grid)
    2.19 +	the resolved value is simply the computed value.
    2.20 +
    2.21  	<div class=example>
    2.22  		<pre>  &lt;style&gt;
    2.23      #grid {