Skip to content

Commit 096bf41

Browse files
committed
[css-grid] Specify that <track-breadth> must be non-negative.
--HG-- extra : rebase_source : 658c37a0a8a1b9dc05969f637209d53a391afb2f
1 parent c8838b8 commit 096bf41

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

css-grid/Overview.html

+29-29
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
rel=dcterms.rights>
1212
<meta content="CSS Grid Layout" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2013-05-08 name=dcterms.date>
14+
<meta content=2013-07-22 name=dcterms.date>
1515
<meta content="Tab Atkins Jr." name=dcterms.creator>
1616
<meta content="Elika J. Etemad" name=dcterms.creator>
1717
<meta content="Rossen Atanassov" name=dcterms.creator>
@@ -59,11 +59,11 @@
5959

6060
<h1 class=title id=title>CSS Grid Layout</h1>
6161

62-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft, 8 May 2013</h2>
62+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft, 22 July 2013</h2>
6363

6464
<dl>
6565
<dt>This version:
66-
<!-- <dd><a href="http://dev.w3.org/csswg/css3-grid-layout/">http://www.w3.org/TR/2013/WD-css3-grid-layout-20130508/</a> -->
66+
<!-- <dd><a href="http://dev.w3.org/csswg/css3-grid-layout/">http://www.w3.org/TR/2013/WD-css3-grid-layout-20130722/</a> -->
6767

6868
<dd><a
6969
href="http://dev.w3.org/csswg/css3-grid-layout/">http://dev.w3.org/csswg/css3-grid-layout/</a>
@@ -1289,7 +1289,7 @@ <h3 id=track-sizing><span class=secno>5.1. </span> Track Sizing: the ‘<a
12891289
<tr>
12901290
<td>Value:
12911291

1292-
<td>none | <a href="#track-list"><var>&lt;track-list></var></a>
1292+
<td>none | <a href="#lttrack-list"><var>&lt;track-list></var></a>
12931293

12941294
<tr>
12951295
<td>Initial:
@@ -1344,30 +1344,30 @@ <h3 id=track-sizing><span class=secno>5.1. </span> Track Sizing: the ‘<a
13441344

13451345
<pre>
13461346
<dfn
1347-
id=track-list>&lt;track-list></dfn> = [ <var>&lt;string></var>* [ <a
1348-
href="#track-size"><var>&lt;track-size></var></a> | <a
1349-
href="#repeat-function"><var>&lt;repeat-function></var></a> ] ]+ <var>&lt;string></var>*
1347+
id=lttrack-list>&lt;track-list></dfn> = [ <var>&lt;string></var>* [ <a
1348+
href="#lttrack-size"><var>&lt;track-size></var></a> | <a
1349+
href="#ltrepeat-function"><var>&lt;repeat-function></var></a> ] ]+ <var>&lt;string></var>*
13501350
<dfn
1351-
id=track-size>&lt;track-size></dfn> = minmax( <a
1352-
href="#track-breadth"><var>&lt;track-breadth></var></a> , <a
1353-
href="#track-breadth"><var>&lt;track-breadth></var></a> ) | auto | <a
1354-
href="#track-breadth"><var>&lt;track-breadth></var></a>
1351+
id=lttrack-size>&lt;track-size></dfn> = minmax( <a
1352+
href="#lttrack-breadth"><var>&lt;track-breadth></var></a> , <a
1353+
href="#lttrack-breadth"><var>&lt;track-breadth></var></a> ) | auto | <a
1354+
href="#lttrack-breadth"><var>&lt;track-breadth></var></a>
13551355
<dfn
1356-
id=track-breadth>&lt;track-breadth></dfn> = <var>&lt;lenh></var> | <var>&lt;percentage></var> | <a
1357-
href="#flex"><var>&lt;flex></var></a> | min-content | max-content</pre>
1356+
id=lttrack-breadth>&lt;track-breadth></dfn> = <var>&lt;length></var> | <var>&lt;percentage></var> | <a
1357+
href="#ltflex"><var>&lt;flex></var></a> | min-content | max-content</pre>
13581358

13591359
<p>Where:
13601360

13611361
<dl>
13621362
<dt><var>&lt;length></var>
13631363

1364-
<dd> As defined by CSS3 Values. <a href="#CSS3VAL"
1364+
<dd> A non-negative length, as defined by CSS3 Values. <a href="#CSS3VAL"
13651365
rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
13661366

13671367
<dt><var>&lt;percentage></var>
13681368

1369-
<dd> As defined by CSS3 Values. <a href="#CSS3VAL"
1370-
rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
1369+
<dd> A non-negative percentage, as defined by CSS3 Values. <a
1370+
href="#CSS3VAL" rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
13711371
<var>&lt;percentage></var> values are relative to the measure (logical
13721372
width) of the <a href="#grid-container"><i>grid container</i></a> in
13731373
<i>grid column tracks</i>, and the extent (logical height) of the <a
@@ -1539,7 +1539,7 @@ <h4 id=repeat-notation><span class=secno>5.1.2. </span> Repeating Rows and
15391539
<pre class=prod>
15401540
<dfn
15411541
id=ltrepeat-function>&lt;repeat-function></dfn> = repeat( <var>&lt;positive-integer></var> , [ <var>&lt;string></var>* <a
1542-
href="#track-size"><var>&lt;track-size></var></a> ]+ <var>&lt;string></var>* )</pre>
1542+
href="#lttrack-size"><var>&lt;track-size></var></a> ]+ <var>&lt;string></var>* )</pre>
15431543

15441544
<p> The first argument specifies the number of repetitions. The second
15451545
argument is a <a href="#track-list"><i>track list</i></a>, which is
@@ -2717,14 +2717,14 @@ <h3 id=algo-terms><span class=secno>8.1. </span> Definition of Terms for
27172717
<dt><dfn id=MaxTrackSizingFunction-definition>MaxTrackSizingFunction</dfn>
27182718

27192719
<dd> One of the <a
2720-
href="#track-breadth"><var>&lt;track-breadth></var></a> sizing
2720+
href="#lttrack-breadth"><var>&lt;track-breadth></var></a> sizing
27212721
functions assigned as the maximum breadth of a <a
27222722
href="#grid-track"><i>Grid track</i></a>.
27232723

27242724
<dt><dfn id=MinTrackSizingFunction-definition>MinTrackSizingFunction</dfn>
27252725

27262726
<dd> One of the <a
2727-
href="#track-breadth"><var>&lt;track-breadth></var></a> sizing
2727+
href="#lttrack-breadth"><var>&lt;track-breadth></var></a> sizing
27282728
functions assigned as the minimum breadth of a <a
27292729
href="#grid-track"><i>Grid track</i></a>.
27302730

@@ -3688,11 +3688,11 @@ <h3 class=no-num id=normative-references> Normative references</h3>
36883688

36893689
<dt id=CSS3-ALIGN>[CSS3-ALIGN]
36903690

3691-
<dd>Elika J. Etemad. <a
3692-
href="http://www.w3.org/TR/2012/WD-css3-align-20120612/"><cite>CSS Box
3693-
Alignment Module Level 3.</cite></a> 12 June 2012. W3C Working Draft.
3691+
<dd>Elika J. Etemad; Tab Atkins Jr. <a
3692+
href="http://www.w3.org/TR/2013/WD-css3-align-20130514/"><cite>CSS Box
3693+
Alignment Module Level 3.</cite></a> 14 May 2013. W3C Working Draft.
36943694
(Work in progress.) URL: <a
3695-
href="http://www.w3.org/TR/2012/WD-css3-align-20120612/">http://www.w3.org/TR/2012/WD-css3-align-20120612/</a>
3695+
href="http://www.w3.org/TR/2013/WD-css3-align-20130514/">http://www.w3.org/TR/2013/WD-css3-align-20130514/</a>
36963696
</dd>
36973697
<!---->
36983698

@@ -3719,10 +3719,10 @@ <h3 class=no-num id=normative-references> Normative references</h3>
37193719
<dt id=CSS3VAL>[CSS3VAL]
37203720

37213721
<dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a
3722-
href="http://www.w3.org/TR/2012/CR-css3-values-20120828/"><cite>CSS
3723-
Values and Units Module Level 3.</cite></a> 28 August 2012. W3C Candidate
3722+
href="http://www.w3.org/TR/2013/CR-css3-values-20130404/"><cite>CSS
3723+
Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate
37243724
Recommendation. (Work in progress.) URL: <a
3725-
href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">http://www.w3.org/TR/2012/CR-css3-values-20120828/</a>
3725+
href="http://www.w3.org/TR/2013/CR-css3-values-20130404/">http://www.w3.org/TR/2013/CR-css3-values-20130404/</a>
37263726
</dd>
37273727
<!---->
37283728

@@ -3989,16 +3989,16 @@ <h2 class=no-num id=index> Index</h2>
39893989
title="section 10.4."><strong>10.4.</strong></a>
39903990
</ul>
39913991

3992-
<li>&lt;track-breadth>, <a href="#track-breadth"
3992+
<li>&lt;track-breadth>, <a href="#lttrack-breadth"
39933993
title="section 5.1."><strong>5.1.</strong></a>
39943994

3995-
<li>&lt;track-list>, <a href="#track-list"
3995+
<li>&lt;track-list>, <a href="#lttrack-list"
39963996
title="section 5.1."><strong>5.1.</strong></a>
39973997

39983998
<li>track list, <a href="#track-list"
39993999
title="section 5.1."><strong>5.1.</strong></a>
40004000

4001-
<li>&lt;track-size>, <a href="#track-size"
4001+
<li>&lt;track-size>, <a href="#lttrack-size"
40024002
title="section 5.1."><strong>5.1.</strong></a>
40034003
</ul>
40044004
<!--end-index-->

css-grid/Overview.src.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -975,11 +975,11 @@ <h3 id='track-sizing'>
975975
<dl>
976976
<dt><var>&lt;length></var>
977977
<dd>
978-
As defined by CSS3 Values. [[!CSS3VAL]]
978+
A non-negative length, as defined by CSS3 Values. [[!CSS3VAL]]
979979

980980
<dt><var>&lt;percentage></var>
981981
<dd>
982-
As defined by CSS3 Values. [[!CSS3VAL]]
982+
A non-negative percentage, as defined by CSS3 Values. [[!CSS3VAL]]
983983
<var>&lt;percentage></var> values are relative to the measure (logical width) of the <i>grid container</i> in <i>grid column tracks</i>,
984984
and the extent (logical height) of the <i>grid container</i> in <i>grid row tracks</i>.
985985
If the measure or extent of the <i>grid container</i> is an <a href="http://www.w3.org/TR/css3-sizing/#indefinite-size">indefinite size</a>,

0 commit comments

Comments
 (0)