Skip to content

Commit bde202e

Browse files
author
Rune Lillesveen
committed
[css-device-adapt] Removed empty CSSOM chapter.
Also renamed DOM Interfaces to CSSOM.
1 parent 5b7ad8c commit bde202e

File tree

2 files changed

+35
-56
lines changed

2 files changed

+35
-56
lines changed

css-device-adapt/Overview.html

+34-46
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
rel=dcterms.rights>
1212
<meta content="CSS Device Adaptation" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2013-10-03 name=dcterms.date>
14+
<meta content=2013-10-04 name=dcterms.date>
1515
<meta content="Rune Lillesveen" name=dcterms.creator>
1616
<meta content="Øyvind Stenhaug" name=dcterms.creator>
1717
<meta content="Florian Rivoal" name=dcterms.creator>
@@ -30,13 +30,13 @@
3030

3131
<h1>CSS Device Adaptation</h1>
3232

33-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 3 October 2013</h2>
33+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 4 October 2013</h2>
3434

3535
<dl>
3636
<dt>This version:
3737

3838
<dd>$Date$ (editor's draft)
39-
<!--<dd><a href="http://dev.w3.org/csswg/css-device-adapt/">http://www.w3.org/TR/2013/WD-css-device-adapt-20131003/</a></dd>-->
39+
<!--<dd><a href="http://dev.w3.org/csswg/css-device-adapt/">http://www.w3.org/TR/2013/WD-css-device-adapt-20131004/</a></dd>-->
4040

4141
<dt>Latest version:
4242

@@ -216,40 +216,37 @@ <h2 class="no-num no-toc" id=table-of-contents>Table of Contents</h2>
216216

217217
<li><a href="#cssom"><span class=secno>8. </span>CSSOM</a>
218218

219-
<li><a href="#dom-interfaces"><span class=secno>9. </span>DOM
220-
Interfaces</a>
219+
<li><a href="#conformance"><span class=secno>9. </span>Conformance</a>
221220

222-
<li><a href="#conformance"><span class=secno>10. </span>Conformance</a>
223-
224-
<li><a href="#viewport-meta"><span class=secno>11. </span>Viewport <code
221+
<li><a href="#viewport-meta"><span class=secno>10. </span>Viewport <code
225222
class=html>META</code> element</a>
226223
<ul class=toc>
227-
<li><a href="#meta-properties"><span class=secno>11.1.
224+
<li><a href="#meta-properties"><span class=secno>10.1.
228225
</span>Properties</a>
229226

230-
<li><a href="#parsing-algorithm"><span class=secno>11.2. </span>Parsing
227+
<li><a href="#parsing-algorithm"><span class=secno>10.2. </span>Parsing
231228
algorithm</a>
232229

233-
<li><a href="#lsquoextend-to-zoomrsquo"><span class=secno>11.3.
230+
<li><a href="#lsquoextend-to-zoomrsquo"><span class=secno>10.3.
234231
</span><code class=css
235232
title=extend-to-zoom>extend-to-zoom</code></a>
236233

237234
<li><a href="#translation-into-atviewport-descriptors"><span
238-
class=secno>11.4. </span>Translation into <code
235+
class=secno>10.4. </span>Translation into <code
239236
class=css>@viewport</code> descriptors</a>
240237
</ul>
241238

242-
<li><a href="#handling-auto-zoom"><span class=secno>12. </span>Handling
239+
<li><a href="#handling-auto-zoom"><span class=secno>11. </span>Handling
243240
<code class=css title="auto!!zoom">auto</code>’ for ‘<code
244241
class=descriptor title="zoom!!descriptor">zoom</code></a>
245242

246-
<li><a href="#ua-stylesheet"><span class=secno>13. </span>UA stylesheets
243+
<li><a href="#ua-stylesheet"><span class=secno>12. </span>UA stylesheets
247244
</a>
248245
<ul class=toc>
249-
<li><a href="#desktop-ua-styles-"><span class=secno>13.1. </span>Desktop
246+
<li><a href="#desktop-ua-styles-"><span class=secno>12.1. </span>Desktop
250247
UA styles </a>
251248

252-
<li><a href="#small-screen-ua-styles"><span class=secno>13.2.
249+
<li><a href="#small-screen-ua-styles"><span class=secno>12.2.
253250
</span>Small screen UA styles</a>
254251
</ul>
255252

@@ -387,7 +384,7 @@ <h2 id=the-atviewport-rule><span class=secno>4. </span>The <code
387384
rules. The declarations allow !important which will affect cascading of
388385
descriptors accordingly.
389386

390-
<p><code class=css>@viewport</code> rules apply to top-level documents
387+
<p><code class=css>@viewport</code> rules apply to top level documents
391388
only.
392389

393390
<div class=example>
@@ -1348,15 +1345,6 @@ <h2 id=media-queries><span class=secno>7. </span>Media Queries</h2>
13481345

13491346
<h2 id=cssom><span class=secno>8. </span>CSSOM</h2>
13501347

1351-
<p class=issue>Properties in the CSSOM and CSSOM View specifications refer
1352-
to the <span>viewport</span> and the <span>initial containing
1353-
block</span>. If any of those properties should refer to the <a
1354-
href="#initial-viewport">initial viewport</a> and not the <a
1355-
href="#actual-viewport">actual viewport</a>, those exceptions need to be
1356-
adressed.
1357-
1358-
<h2 id=dom-interfaces><span class=secno>9. </span>DOM Interfaces</h2>
1359-
13601348
<p>The <code class=css>@viewport</code> rule is exposed to the CSSOM
13611349
through a new CSSRule interface
13621350

@@ -1418,7 +1406,7 @@ <h2 id=dom-interfaces><span class=secno>9. </span>DOM Interfaces</h2>
14181406
</dl>
14191407
</dl>
14201408

1421-
<h2 id=conformance><span class=secno>10. </span>Conformance</h2>
1409+
<h2 id=conformance><span class=secno>9. </span>Conformance</h2>
14221410

14231411
<p>Requirements for a conforming UA:
14241412

@@ -1456,7 +1444,7 @@ <h2 id=conformance><span class=secno>10. </span>Conformance</h2>
14561444
descriptors is optional.
14571445
</ul>
14581446

1459-
<h2 id=viewport-meta><span class=secno>11. </span>Viewport <code
1447+
<h2 id=viewport-meta><span class=secno>10. </span>Viewport <code
14601448
class=html>META</code> element</h2>
14611449

14621450
<p><em>This section is not normative.</em>
@@ -1485,7 +1473,7 @@ <h2 id=viewport-meta><span class=secno>11. </span>Viewport <code
14851473
device like the original iPhone, but only 960px if you have a 240px
14861474
display (all widths being given in CSS pixel units).
14871475

1488-
<h3 id=meta-properties><span class=secno>11.1. </span>Properties</h3>
1476+
<h3 id=meta-properties><span class=secno>10.1. </span>Properties</h3>
14891477

14901478
<p>The recognized properties in the viewport <code class=html>META</code>
14911479
element are:
@@ -1505,7 +1493,7 @@ <h3 id=meta-properties><span class=secno>11.1. </span>Properties</h3>
15051493
<li><code class=index id=user-scalable>user-scalable</code>
15061494
</ul>
15071495

1508-
<h3 id=parsing-algorithm><span class=secno>11.2. </span>Parsing algorithm</h3>
1496+
<h3 id=parsing-algorithm><span class=secno>10.2. </span>Parsing algorithm</h3>
15091497

15101498
<p>Below is an algorithm for parsing the <code class=html>content</code>
15111499
attribute of the <code class=html>META</code> tag produced from testing
@@ -1677,7 +1665,7 @@ <h3 id=parsing-algorithm><span class=secno>11.2. </span>Parsing algorithm</h3>
16771665
unknown.
16781666
</ol>
16791667

1680-
<h3 id=lsquoextend-to-zoomrsquo><span class=secno>11.3. </span><code
1668+
<h3 id=lsquoextend-to-zoomrsquo><span class=secno>10.3. </span><code
16811669
class=css title=extend-to-zoom>extend-to-zoom</code></h3>
16821670

16831671
<p>In order to be able to implement the functionality from <code
@@ -1773,7 +1761,7 @@ <h4 class="no-num no-toc" id=resolving-lsquoextend-to-zoomrsquo>Resolving
17731761
</ol>
17741762
</ul>
17751763

1776-
<h3 id=translation-into-atviewport-descriptors><span class=secno>11.4.
1764+
<h3 id=translation-into-atviewport-descriptors><span class=secno>10.4.
17771765
</span>Translation into <code class=css>@viewport</code> descriptors</h3>
17781766

17791767
<p>The Viewport <code class=html>META</code> element is placed in the
@@ -1976,7 +1964,7 @@ <h4 class="no-num no-toc" id=the-user-scalable-property>The <code
19761964
--></pre>
19771965
</div>
19781966

1979-
<h2 id=handling-auto-zoom><span class=secno>12. </span>Handling ‘<a
1967+
<h2 id=handling-auto-zoom><span class=secno>11. </span>Handling ‘<a
19801968
href="#auto0"><code class=css title="auto!!zoom">auto</code></a>’ for
19811969
<code class=descriptor title="zoom!!descriptor">zoom</code></h2>
19821970

@@ -2006,7 +1994,7 @@ <h2 id=handling-auto-zoom><span class=secno>12. </span>Handling ‘<a
20061994
<p>The actual zoom factor should also be further limited by the [min-zoom,
20071995
max-zoom] range.
20081996

2009-
<h2 id=ua-stylesheet><span class=secno>13. </span>UA stylesheets</h2>
1997+
<h2 id=ua-stylesheet><span class=secno>12. </span>UA stylesheets</h2>
20101998

20111999
<p><em>This section is informative</em>
20122000

@@ -2016,15 +2004,15 @@ <h2 id=ua-stylesheet><span class=secno>13. </span>UA stylesheets</h2>
20162004
computer to have. In that sense, it could include tablet PC and TV
20172005
browsers.
20182006

2019-
<h3 id=desktop-ua-styles-><span class=secno>13.1. </span>Desktop UA styles</h3>
2007+
<h3 id=desktop-ua-styles-><span class=secno>12.1. </span>Desktop UA styles</h3>
20202008

20212009
<p>For a desktop browser, the recommendation is to have no UA styles. That
20222010
means that it will have all descriptors initially set to ‘<code
20232011
class=css>auto</code>’, and behave as it would have without support for
20242012
viewport descriptors if there are no viewport descriptors in the user or
20252013
author styles.
20262014

2027-
<h3 id=small-screen-ua-styles><span class=secno>13.2. </span>Small screen
2015+
<h3 id=small-screen-ua-styles><span class=secno>12.2. </span>Small screen
20282016
UA styles</h3>
20292017

20302018
<p>For smaller screen UAs like smartphone browsers, the UA could typically
@@ -2229,7 +2217,7 @@ <h2 class=no-num id=index>Index</h2>
22292217
<li>device-height
22302218
<ul>
22312219
<li>viewport META, <a href="#device-height"
2232-
title="section 11.2.">11.2.</a>, <a href="#device-height0"
2220+
title="section 10.2.">10.2.</a>, <a href="#device-height0"
22332221
title="section ??">??</a>, <a href="#device-height1"
22342222
title="section ??">??</a>, <a href="#device-height2"
22352223
title="section ??">??</a>
@@ -2238,7 +2226,7 @@ <h2 class=no-num id=index>Index</h2>
22382226
<li>device-width
22392227
<ul>
22402228
<li>viewport META, <a href="#device-width"
2241-
title="section 11.2.">11.2.</a>, <a href="#device-width0"
2229+
title="section 10.2.">10.2.</a>, <a href="#device-width0"
22422230
title="section ??">??</a>, <a href="#device-width1"
22432231
title="section ??">??</a>, <a href="#device-width2"
22442232
title="section ??">??</a>
@@ -2254,13 +2242,13 @@ <h2 class=no-num id=index>Index</h2>
22542242

22552243
<li>resolved, <a href="#height0" title="section 6.1.">6.1.</a>
22562244

2257-
<li>viewport META, <a href="#height1" title="section 11.1.">11.1.</a>,
2245+
<li>viewport META, <a href="#height1" title="section 10.1.">10.1.</a>,
22582246
<a href="#height2" title="section ??">??</a>, <a href="#height3"
22592247
title="section ??">??</a>
22602248
</ul>
22612249

22622250
<li>initial-scale, <a href="#initial-scale"
2263-
title="section 11.1.">11.1.</a>, <a href="#initial-scale0"
2251+
title="section 10.1.">10.1.</a>, <a href="#initial-scale0"
22642252
title="section ??">??</a>
22652253

22662254
<li>initial viewport, <a href="#initial-viewport"
@@ -2273,7 +2261,7 @@ <h2 class=no-num id=index>Index</h2>
22732261
title="section 5.3."><strong>5.3.</strong></a>
22742262

22752263
<li>maximum-scale, <a href="#maximum-scale"
2276-
title="section 11.1.">11.1.</a>, <a href="#maximum-scale0"
2264+
title="section 10.1.">10.1.</a>, <a href="#maximum-scale0"
22772265
title="section ??">??</a>
22782266

22792267
<li>max-width, <a href="#max-width"
@@ -2286,7 +2274,7 @@ <h2 class=no-num id=index>Index</h2>
22862274
title="section 5.3."><strong>5.3.</strong></a>
22872275

22882276
<li>minimum-scale, <a href="#minimum-scale"
2289-
title="section 11.1.">11.1.</a>, <a href="#minimum-scale0"
2277+
title="section 10.1.">10.1.</a>, <a href="#minimum-scale0"
22902278
title="section ??">??</a>
22912279

22922280
<li>min-width, <a href="#min-width"
@@ -2295,7 +2283,7 @@ <h2 class=no-num id=index>Index</h2>
22952283
<li>min-zoom, <a href="#min-zoom"
22962284
title="section 5.6."><strong>5.6.</strong></a>
22972285

2298-
<li>no, <a href="#no" title="section 11.2.">11.2.</a>, <a href="#no0"
2286+
<li>no, <a href="#no" title="section 10.2.">10.2.</a>, <a href="#no0"
22992287
title="section ??">??</a>, <a href="#no1" title="section ??">??</a>
23002288

23012289
<li>orientation, <a href="#orientation"
@@ -2310,7 +2298,7 @@ <h2 class=no-num id=index>Index</h2>
23102298
title="section 6.2."><strong>6.2.</strong></a>
23112299

23122300
<li>user-scalable, <a href="#user-scalable"
2313-
title="section 11.1.">11.1.</a>, <a href="#user-scalable0"
2301+
title="section 10.1.">10.1.</a>, <a href="#user-scalable0"
23142302
title="section ??">??</a>, <a href="#user-scalable1"
23152303
title="section ??">??</a>
23162304

@@ -2328,12 +2316,12 @@ <h2 class=no-num id=index>Index</h2>
23282316

23292317
<li>resolved, <a href="#width0" title="section 6.1.">6.1.</a>
23302318

2331-
<li>viewport META, <a href="#width1" title="section 11.1.">11.1.</a>, <a
2319+
<li>viewport META, <a href="#width1" title="section 10.1.">10.1.</a>, <a
23322320
href="#width2" title="section ??">??</a>, <a href="#width3"
23332321
title="section ??">??</a>
23342322
</ul>
23352323

2336-
<li>yes, <a href="#yes" title="section 11.2.">11.2.</a>, <a href="#yes0"
2324+
<li>yes, <a href="#yes" title="section 10.2.">10.2.</a>, <a href="#yes0"
23372325
title="section ??">??</a>, <a href="#yes1" title="section ??">??</a>
23382326

23392327
<li>zoom, <a href="#zoom" title="section 5.5."><strong>5.5.</strong></a>

css-device-adapt/Overview.src.html

+1-10
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ <h2>The <code class="css">@viewport</code> rule</h2>
177177
cascading of descriptors accordingly.
178178
</p>
179179

180-
<p><code class="css">@viewport</code> rules apply to top-level documents only.</p>
180+
<p><code class="css">@viewport</code> rules apply to top level documents only.</p>
181181

182182
<div class="example">
183183
<p>This example sets the viewport to at least 320px, but otherwise match
@@ -1088,17 +1088,8 @@ <h2>Media Queries</h2>
10881088
placed as early in the document as possible to avoid unnecessary
10891089
re-evaluation of media queries or reflows.</p>
10901090

1091-
10921091
<h2>CSSOM</h2>
10931092

1094-
<p class="issue">Properties in the CSSOM and CSSOM View specifications refer
1095-
to the <span>viewport</span> and the <span>initial containing block</span>.
1096-
If any of those properties should refer to the <span>initial viewport</span>
1097-
and not the <span>actual viewport</span>, those exceptions need to be
1098-
adressed.</p>
1099-
1100-
<h2>DOM Interfaces</h2>
1101-
11021093
<p>The <code class="css">@viewport</code> rule is exposed to the CSSOM
11031094
through a new CSSRule interface</p>
11041095

0 commit comments

Comments
 (0)