Skip to content

Commit a6d97eb

Browse files
author
Ryan Betts
committed
merge
2 parents e77b5c5 + b403369 commit a6d97eb

83 files changed

Lines changed: 10590 additions & 11464 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

css-module/Overview.html

Lines changed: 34 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
<h1>CSS <var class=replaceme>TEMPLATE</var> Module Level <var
3838
class=replaceme>N</var></h1>
3939

40-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 April 2012</h2>
40+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 31 July 2012</h2>
4141

4242
<dl>
4343
<dt>This version:
4444

4545
<dd><a class=replaceme
46-
href="http://www.w3.org/TR/2012/ED-cssN-FIXME-20120410/">http://www.w3.org/TR/2012/ED-cssN-FIXME-20120410/</a>
46+
href="http://www.w3.org/TR/2012/ED-cssN-FIXME-20120731/">http://www.w3.org/TR/2012/ED-cssN-FIXME-20120731/</a>
4747

4848

4949
<dt>Latest version:
@@ -73,8 +73,8 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 April 2012</h2>
7373

7474
<dd><a
7575
href="http://lists.w3.org/Archives/Public/www-style/">www-style@w3.org</a>
76-
with subject line &ldquo;<kbd>[cssN-FIXME] <var>&hellip; message topic
77-
&hellip;</var></kbd>&rdquo;
76+
with subject line <kbd>[cssN-FIXME] <var> message topic
77+
</var></kbd>
7878

7979
<dt>Editors:
8080

@@ -90,8 +90,8 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 April 2012</h2>
9090
<!--begin-copyright-->
9191
<p class=copyright><a
9292
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
93-
rel=license>Copyright</a> &copy; 2012 <a href="http://www.w3.org/"><abbr
94-
title="World Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
93+
rel=license>Copyright</a> © 2012 <a href="http://www.w3.org/"><abbr
94+
title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a
9595
href="http://www.csail.mit.edu/"><abbr
9696
title="Massachusetts Institute of Technology">MIT</abbr></a>, <a
9797
href="http://www.ercim.eu/"><abbr
@@ -109,16 +109,11 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 April 2012</h2>
109109

110110
<h2 class="no-num no-toc" id=abstract>Abstract</h2>
111111

112-
<p><a href="http://www.w3.org/TR/CSS/">CSS</a> is a language for describing
113-
the rendering of structured documents (such as HTML and XML) on screen, on
114-
paper, in speech, etc. This module contains the features of CSS relating
115-
to <var class=replaceme>DESCRIBE HERE</var>. It includes and extends the
116-
functionality of <var class=replaceme>CSS level&nbsp;2 <a href="#CSS21"
117-
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, which builds on CSS
118-
level&nbsp;1 <a href="#CSS1"
119-
rel=biblioentry>[CSS1]<!--{{CSS1}}--></a></var>. The main extensions
120-
compared to <var class=replaceme>level&nbsp;2</var> are <var
121-
class=replaceme>SUMMARIZE HERE</var>.
112+
<p>This module contains the features of CSS relating to <var
113+
class=replaceme>DESCRIBE HERE</var>. <a
114+
href="http://www.w3.org/TR/CSS/">CSS</a> is a language for describing the
115+
rendering of structured documents (such as HTML and XML) on screen, on
116+
paper, in speech, etc.
122117

123118
<h2 class="no-num no-toc" id=status>Status of this document</h2>
124119
<!--begin-status-->
@@ -135,9 +130,8 @@ <h2 class="no-num no-toc" id=status>Status of this document</h2>
135130
www-style@w3.org</a> (see <a
136131
href="http://www.w3.org/Mail/Request">instructions</a>) is preferred for
137132
discussion of this specification. When sending e-mail, please put the text
138-
&#8220;cssN-FIXME&#8221; in the subject, preferably like this:
139-
&#8220;[<!---->cssN-FIXME<!---->] <em>&hellip;summary of
140-
comment&hellip;</em>&#8221;
133+
“cssN-FIXME” in the subject, preferably like this:
134+
“[<!---->cssN-FIXME<!---->] <em>…summary of comment…</em>
141135

142136
<p>This document was produced by the <a href="/Style/CSS/members">CSS
143137
Working Group</a> (part of the <a href="/Style/">Style Activity</a>).
@@ -155,7 +149,7 @@ <h2 class="no-num no-toc" id=status>Status of this document</h2>
155149
W3C Patent Policy</a>.</p>
156150
<!--end-status-->
157151

158-
<p>The following features are at risk: &hellip;
152+
<p>The following features are at risk:
159153

160154
<h2 class="no-num no-toc" id=contents> Table of contents</h2>
161155
<!--begin-toc-->
@@ -173,8 +167,8 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
173167
section</a>
174168
<ul class=toc>
175169
<li><a href="#the-display-model"><span class=secno>2.1. </span> Internal
176-
display model: the &lsquo;<code
177-
class=property>display-inside</code>&rsquo; property</a>
170+
display model: the <code class=property>display-inside</code>
171+
property</a>
178172
</ul>
179173

180174
<li><a href="#conformance"><span class=secno>3. </span> Conformance</a>
@@ -271,16 +265,16 @@ <h2 id=sample-topic><span class=secno>2. </span> Sample section</h2>
271265

272266
<p>To refer to HTML, use <a href="#HTML40"
273267
rel=biblioentry>[HTML40]<!--{{HTML40}}--></a> (note the double square
274-
brackets). To make a normative reference, insert a &ldquo;!&rdquo;, like
275-
this: <a href="#CSS3SYN" rel=biblioentry>[CSS3SYN]<!--{{!CSS3SYN}}--></a>
276-
The currently available <a
268+
brackets). To make a normative reference, insert a “!”, like this: <a
269+
href="#CSS3SYN" rel=biblioentry>[CSS3SYN]<!--{{!CSS3SYN}}--></a> The
270+
currently available <a
277271
href="https://www.w3.org/Style/Group/css3-src/biblio.ref">list of
278272
bibliographic data</a> can of course be extended.
279273

280-
<p>We write about a property such as &lsquo;<code
281-
class=property>display-model</code>&rsquo; like this and about a piece of
282-
CSS code like this: &lsquo;<code class=css>foo: bar</code>&rsquo;. Inline
283-
HTML and XML are similar, but use the CODE element: <code
274+
<p>We write about a property such as <code
275+
class=property>display-model</code> like this and about a piece of CSS
276+
code like this: <code class=css>foo: bar</code>. Inline HTML and XML
277+
are similar, but use the CODE element: <code
284278
class=html>&lt;blockquote&gt;...&lt;/blockquote&gt;</code> and <code
285279
class=xml>&lt;r:xyz&gt;...&lt;/r:xyz&gt;</code>.
286280

@@ -328,8 +322,8 @@ <h2 id=sample-topic><span class=secno>2. </span> Sample section</h2>
328322
<p>A formal definition of a property looks like this:
329323

330324
<h3 id=the-display-model><span class=secno>2.1. </span> Internal display
331-
model: the &lsquo;<a href="#display-inside"><code
332-
class=property>display-inside</code></a>&rsquo; property</h3>
325+
model: the <a href="#display-inside"><code
326+
class=property>display-inside</code></a> property</h3>
333327

334328
<table class=propdef>
335329
<tbody>
@@ -369,7 +363,7 @@ <h3 id=the-display-model><span class=secno>2.1. </span> Internal display
369363
<td>visual
370364

371365
<tr>
372-
<th>Computed&nbsp;value:
366+
<th>Computed value:
373367

374368
<td>specified value
375369

@@ -386,8 +380,7 @@ <h3 id=the-display-model><span class=secno>2.1. </span> Internal display
386380
</table>
387381

388382
<dl>
389-
<dt><dfn id=value-name>&lsquo;<code
390-
class=css>value-name</code>&rsquo;</dfn>
383+
<dt><dfn id=value-name><code class=css>value-name</code></dfn>
391384

392385
<dd>Define values using a DL
393386
</dl>
@@ -413,8 +406,8 @@ <h3 id=the-display-model><span class=secno>2.1. </span> Internal display
413406
<p>Don't forget to write the longdesc.
414407

415408
<p class=issue>An open issue or editorial remark is OK in a WD, but they
416-
should be resolved/removed before the document goes to &ldquo;CR&rdquo;
417-
(Candidate Recommendation). Use class=&ldquo;issue&rdquo;.
409+
should be resolved/removed before the document goes to “CR” (Candidate
410+
Recommendation). Use class=issue.
418411

419412
<h2 id=conformance><span class=secno>3. </span> Conformance</h2>
420413

@@ -611,7 +604,7 @@ <h3 class=no-num id=normative-references> Normative references</h3>
611604

612605
<dd>Bert Bos; et al. <a
613606
href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading Style
614-
Sheets Level 2 Revision 1 (CSS&#160;2.1) Specification.</cite></a> 7 June
607+
Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 June
615608
2011. W3C Recommendation. URL: <a
616609
href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a>
617610
</dd>
@@ -646,19 +639,9 @@ <h3 class=no-num id=other-references> Other references</h3>
646639
<dt style="display: none"><!-- keeps the doc valid if the DL is empty -->
647640
<!---->
648641

649-
<dt id=CSS1>[CSS1]
650-
651-
<dd>H&#229;kon Wium Lie; Bert Bos. <a
652-
href="http://www.w3.org/TR/2008/REC-CSS1-20080411"><cite>Cascading Style
653-
Sheets (CSS1) Level 1 Specification.</cite></a> 11 April 2008. W3C
654-
Recommendation. URL: <a
655-
href="http://www.w3.org/TR/2008/REC-CSS1-20080411">http://www.w3.org/TR/2008/REC-CSS1-20080411</a>
656-
</dd>
657-
<!---->
658-
659642
<dt id=CSS3COLOR>[CSS3COLOR]
660643

661-
<dd>Tantek &#199;elik; Chris Lilley; L. David Baron. <a
644+
<dd>Tantek Çelik; Chris Lilley; L. David Baron. <a
662645
href="http://www.w3.org/TR/2011/REC-css3-color-20110607"><cite>CSS Color
663646
Module Level 3.</cite></a> 7 June 2011. W3C Recommendation. URL: <a
664647
href="http://www.w3.org/TR/2011/REC-css3-color-20110607">http://www.w3.org/TR/2011/REC-css3-color-20110607</a>
@@ -718,8 +701,8 @@ <h2 class=no-num id=index> Index</h2>
718701

719702
<li>terms, <a href="#terms" title=terms>2.</a>
720703

721-
<li>&lsquo;<code class=css>value-name</code>&rsquo;, <a href="#value-name"
722-
title="''value-name''"><strong>2.1.</strong></a>
704+
<li><a href="#value-name"><code class=css>value-name</code></a>, <a
705+
href="#value-name" title="''value-name''"><strong>2.1.</strong></a>
723706

724707
<li>variant, <a href="#variants" title=variant>2.</a>
725708

@@ -739,7 +722,7 @@ <h2 class=no-num id=property-index> Property index</h2>
739722

740723
<th>Initial
741724

742-
<th>Applies&nbsp;to
725+
<th>Applies to
743726

744727
<th>Inh.
745728

css3-animations/Overview.html

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
<h1>CSS Animations</h1>
1717

18-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 12 July 2012</h2>
18+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 August 2012</h2>
1919

2020
<dl>
2121
<dt>This version:
2222

2323
<dd><a
24-
href="http://www.w3.org/TR/2012/ED-css3-animations-20120712/">http://dev.w3.org/csswg/css3-animations/</a>
25-
<!--http://www.w3.org/TR/2012/WD-css3-animations-20120712/-->
24+
href="http://www.w3.org/TR/2012/ED-css3-animations-20120808/">http://dev.w3.org/csswg/css3-animations/</a>
25+
<!--http://www.w3.org/TR/2012/WD-css3-animations-20120808/-->
2626

2727
<dt>Latest version:
2828

@@ -411,7 +411,9 @@ <h2 id=keyframes><span class=secno>3. </span> Keyframes</h2>
411411
class=css>100%</code>’ or ‘<code class=css>to</code>’ keyframe is
412412
not specified, then the user agent constructs a ‘<code
413413
class=css>100%</code>’ keyframe using the computed values of the
414-
properties being animated.
414+
properties being animated. If a keyframe selector specifies negative
415+
percentage values or values higher than 100%, then the keyframe will be
416+
ignored.
415417

416418
<p> The <dfn id=keyframe-declaration-block>keyframe declaration block</dfn>
417419
for a keyframe rule consists of properties and values. Properties that are
@@ -1676,27 +1678,6 @@ <h2 class=no-num id=property-index>Property index</h2>
16761678
<th>Media
16771679

16781680
<tbody>
1679-
<tr>
1680-
<th><a class=property href="#animation">animation</a>
1681-
1682-
<td>[ &lt;animation-name&gt; || &lt;animation-duration&gt; ||
1683-
&lt;animation-timing-function&gt; || &lt;animation-delay&gt; ||
1684-
&lt;animation-iteration-count&gt; || &lt;animation-direction&gt; ||
1685-
&lt;animation-fill-mode&gt; ] [, [ &lt;animation-name&gt; ||
1686-
&lt;animation-duration&gt; || &lt;animation-timing-function&gt; ||
1687-
&lt;animation-delay&gt; || &lt;animation-iteration-count&gt; ||
1688-
&lt;animation-direction&gt; || &lt;animation-fill-mode&gt; ] ]*
1689-
1690-
<td>see individual properties
1691-
1692-
<td>all elements
1693-
1694-
<td>see individual properties
1695-
1696-
<td>see individual properties
1697-
1698-
<td>visual
1699-
17001681
<tr>
17011682
<th><a class=property href="#animation-delay">animation-delay</a>
17021683

@@ -1708,7 +1689,7 @@ <h2 class=no-num id=property-index>Property index</h2>
17081689

17091690
<td>no
17101691

1711-
<td>as specified
1692+
<td>
17121693

17131694
<td>visual
17141695

@@ -1725,7 +1706,7 @@ <h2 class=no-num id=property-index>Property index</h2>
17251706

17261707
<td>no
17271708

1728-
<td>as specified
1709+
<td>
17291710

17301711
<td>visual
17311712

@@ -1741,7 +1722,7 @@ <h2 class=no-num id=property-index>Property index</h2>
17411722

17421723
<td>no
17431724

1744-
<td>as specified
1725+
<td>
17451726

17461727
<td>visual
17471728

@@ -1758,7 +1739,7 @@ <h2 class=no-num id=property-index>Property index</h2>
17581739

17591740
<td>no
17601741

1761-
<td>as specified
1742+
<td>
17621743

17631744
<td>visual
17641745

@@ -1774,7 +1755,7 @@ <h2 class=no-num id=property-index>Property index</h2>
17741755

17751756
<td>no
17761757

1777-
<td>as specified
1758+
<td>
17781759

17791760
<td>visual
17801761

@@ -1789,7 +1770,7 @@ <h2 class=no-num id=property-index>Property index</h2>
17891770

17901771
<td>no
17911772

1792-
<td>As specified
1773+
<td>
17931774

17941775
<td>visual
17951776

@@ -1805,7 +1786,28 @@ <h2 class=no-num id=property-index>Property index</h2>
18051786

18061787
<td>no
18071788

1808-
<td>as specified
1789+
<td>
1790+
1791+
<td>visual
1792+
1793+
<tr>
1794+
<th><a class=property href="#animation">animation</a>
1795+
1796+
<td>[ &lt;animation-name&gt; || &lt;animation-duration&gt; ||
1797+
&lt;animation-timing-function&gt; || &lt;animation-delay&gt; ||
1798+
&lt;animation-iteration-count&gt; || &lt;animation-direction&gt; ||
1799+
&lt;animation-fill-mode&gt; ] [, [ &lt;animation-name&gt; ||
1800+
&lt;animation-duration&gt; || &lt;animation-timing-function&gt; ||
1801+
&lt;animation-delay&gt; || &lt;animation-iteration-count&gt; ||
1802+
&lt;animation-direction&gt; || &lt;animation-fill-mode&gt; ] ]*
1803+
1804+
<td>see individual properties
1805+
1806+
<td>all elements
1807+
1808+
<td>see individual properties
1809+
1810+
<td>
18091811

18101812
<td>visual
18111813

@@ -1827,7 +1829,7 @@ <h2 class=no-num id=property-index>Property index</h2>
18271829

18281830
<td>no
18291831

1830-
<td>as specified
1832+
<td>
18311833

18321834
<td>visual
18331835
</table>

css3-animations/Overview.src.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,11 @@ <h2 id="keyframes">
248248
using the computed values of the properties being animated.
249249
If a ''100%'' or ''to'' keyframe is not specified,
250250
then the user agent constructs a ''100%'' keyframe
251-
using the computed values of the properties being animated.
251+
using the computed values of the properties being animated.
252+
If a keyframe selector specifies
253+
negative percentage values or
254+
values higher than 100%,
255+
then the keyframe will be ignored.
252256

253257
<p>
254258
The <dfn>keyframe declaration block</dfn> for a keyframe rule

0 commit comments

Comments
 (0)