Skip to content

Commit 80cd88c

Browse files
committed
[mediaqueries] Define <dimension> and <ident> locally.
1 parent cc8f2b6 commit 80cd88c

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

mediaqueries/Overview.bs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,8 @@ Syntax</h2>
655655
</pre>
656656

657657
The <<media-type>> production does not include the keywords ''only'', ''not'', ''and'', and ''or''.
658+
A <dfn>&lt;dimension></dfn> is a <a>dimension</a>.
659+
An <dfn>&lt;ident></dfn> is an <a>identifier</a>.
658660

659661
No whitespace is allowed between the "<" or ">" <<delim-token>>s and the following "=" <<delim-token>>,
660662
if it's present.

mediaqueries/Overview.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ <h2 class="heading settled heading" data-level=3 id=mq-syntax><span class=secno>
11231123

11241124
<pre><dfn class=css-code data-dfn-type=type data-export="" id=typedef-media-query>&lt;media-query&gt;<a class=self-link href=#typedef-media-query></a></dfn> = <a class="production css-code" data-link-type=type href=#typedef-media-condition title="<media-condition>">&lt;media-condition&gt;</a>?
11251125
| [ not | only ]? <a class="production css-code" data-link-type=type href=#typedef-media-type title="<media-type>">&lt;media-type&gt;</a> [ and <a class="production css-code" data-link-type=type href=#typedef-media-condition title="<media-condition>">&lt;media-condition&gt;</a> ]?
1126-
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-media-type>&lt;media-type&gt;<a class=self-link href=#typedef-media-type></a></dfn> = <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a>
1126+
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-media-type>&lt;media-type&gt;<a class=self-link href=#typedef-media-type></a></dfn> = <a class="production css-code" data-link-type=type href=#typedef-ident title="<ident>">&lt;ident&gt;</a>
11271127

11281128
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-media-condition>&lt;media-condition&gt;<a class=self-link href=#typedef-media-condition></a></dfn> = <a class="production css-code" data-link-type=type href=#typedef-media-not title="<media-not>">&lt;media-not&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-media-and title="<media-and>">&lt;media-and&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-media-or title="<media-or>">&lt;media-or&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-media-in-parens title="<media-in-parens>">&lt;media-in-parens&gt;</a>
11291129
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-media-not>&lt;media-not&gt;<a class=self-link href=#typedef-media-not></a></dfn> = not <a class="production css-code" data-link-type=type href=#typedef-media-in-parens title="<media-in-parens>">&lt;media-in-parens&gt;</a>
@@ -1138,12 +1138,14 @@ <h2 class="heading settled heading" data-level=3 id=mq-syntax><span class=secno>
11381138
| <a class="production css-code" data-link-type=type href=#typedef-mf-value title="<mf-value>">&lt;mf-value&gt;</a> [ '&lt;' | '&gt;' ]? '='? <a class="production css-code" data-link-type=type href=#typedef-mf-name title="<mf-name>">&lt;mf-name&gt;</a>
11391139
| <a class="production css-code" data-link-type=type href=#typedef-mf-value title="<mf-value>">&lt;mf-value&gt;</a> '&lt;' '='? <a class="production css-code" data-link-type=type href=#typedef-mf-name title="<mf-name>">&lt;mf-name&gt;</a> '&lt;' '='? <a class="production css-code" data-link-type=type href=#typedef-mf-value title="<mf-value>">&lt;mf-value&gt;</a>
11401140
| <a class="production css-code" data-link-type=type href=#typedef-mf-value title="<mf-value>">&lt;mf-value&gt;</a> '&gt;' '='? <a class="production css-code" data-link-type=type href=#typedef-mf-name title="<mf-name>">&lt;mf-name&gt;</a> '&gt;' '='? <a class="production css-code" data-link-type=type href=#typedef-mf-value title="<mf-value>">&lt;mf-value&gt;</a>
1141-
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-mf-name>&lt;mf-name&gt;<a class=self-link href=#typedef-mf-name></a></dfn> = <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a>
1142-
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-mf-value>&lt;mf-value&gt;<a class=self-link href=#typedef-mf-value></a></dfn> = <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#number-value title="<number>">&lt;number&gt;</a> | <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltdimension title="<dimension>">&lt;dimension&gt;</a> | <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#ltident title="<ident>">&lt;ident&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-ratio title="<ratio>">&lt;ratio&gt;</a>
1141+
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-mf-name>&lt;mf-name&gt;<a class=self-link href=#typedef-mf-name></a></dfn> = <a class="production css-code" data-link-type=type href=#typedef-ident title="<ident>">&lt;ident&gt;</a>
1142+
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-mf-value>&lt;mf-value&gt;<a class=self-link href=#typedef-mf-value></a></dfn> = <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#number-value title="<number>">&lt;number&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-dimension title="<dimension>">&lt;dimension&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-ident title="<ident>">&lt;ident&gt;</a> | <a class="production css-code" data-link-type=type href=#typedef-ratio title="<ratio>">&lt;ratio&gt;</a>
11431143

11441144
<dfn class=css-code data-dfn-type=type data-export="" id=typedef-general-enclosed>&lt;general-enclosed&gt;<a class=self-link href=#typedef-general-enclosed></a></dfn> = [ <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-function-token title="<function-token>">&lt;function-token&gt;</a> | ( ] <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-variables-1/#typedef-any-value title="<any-value>">&lt;any-value&gt;</a>* )
11451145
</pre>
11461146
<p> The <a class="production css-code" data-link-type=type href=#typedef-media-type title="<media-type>">&lt;media-type&gt;</a> production does not include the keywords <a class=css data-link-type=maybe href=#valuedef-only title=only>only</a>, <a class=css data-link-type=maybe href=#valuedef-not title=not>not</a>, <span class=css data-link-type=maybe title=and>and</span>, and <span class=css data-link-type=maybe title=or>or</span>.
1147+
A <dfn class=css-code data-dfn-type=type data-export="" id=typedef-dimension>&lt;dimension&gt;<a class=self-link href=#typedef-dimension></a></dfn> is a <a data-link-type=dfn href=http://dev.w3.org/csswg/css-values-3/#dimension title=dimension>dimension</a>.
1148+
An <dfn class=css-code data-dfn-type=type data-export="" id=typedef-ident>&lt;ident&gt;<a class=self-link href=#typedef-ident></a></dfn> is an <a data-link-type=dfn href=http://dev.w3.org/csswg/css-syntax-3/#identifier title=identifier>identifier</a>.
11471149

11481150
<p> No whitespace is allowed between the "&lt;" or "&gt;" <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-delim-token title="<delim-token>">&lt;delim-token&gt;</a>s and the following "=" <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-delim-token title="<delim-token>">&lt;delim-token&gt;</a>,
11491151
if it’s present.
@@ -2212,6 +2214,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
22122214
<li>device-height, <a href=#descdef-device-height title="section 4.6">4.6</a>
22132215
<li>device-width, <a href=#descdef-device-width title="section 4.5">4.5</a>
22142216
<li>dim, <a href=#valuedef-dim title="section 8.1">8.1</a>
2217+
<li>&lt;dimension&gt;, <a href=#typedef-dimension title="section 3">3</a>
22152218
<li>embossed, <a href=#valuedef-embossed title="section 2.3">2.3</a>
22162219
<li>enabled, <a href=#valuedef-enabled title="section 9.1">9.1</a>
22172220
<li>fine, <a href=#valuedef-fine title="section 7.1">7.1</a>
@@ -2221,7 +2224,8 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
22212224
<li>height, <a href=#descdef-height title="section 4.2">4.2</a>
22222225
<li>hover<ul><li>descriptor for @media, <a href=#descdef-hover title="section 7.2">7.2</a>
22232226
<li>value for @media/hover, <a href=#valuedef-hover title="section 7.2">7.2</a>
2224-
</ul><li>initial-only, <a href=#valuedef-initial-only title="section 9.1">9.1</a>
2227+
</ul><li>&lt;ident&gt;, <a href=#typedef-ident title="section 3">3</a>
2228+
<li>initial-only, <a href=#valuedef-initial-only title="section 9.1">9.1</a>
22252229
<li>interlace, <a href=#valuedef-interlace title="section 5.2">5.2</a>
22262230
<li>light-level, <a href=#descdef-light-level title="section 8.1">8.1</a>
22272231
<li>&lt;media-and&gt;, <a href=#typedef-media-and title="section 3">3</a>

0 commit comments

Comments
 (0)