Skip to content

Commit c59ce58

Browse files
authored
Merge branch 'master' into computed-color-scheme-as-specified
2 parents 449e540 + 155b0e6 commit c59ce58

File tree

92 files changed

+7349
-9774
lines changed

Some content is hidden

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

92 files changed

+7349
-9774
lines changed

README.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ contributing using Mercurial is also possible.
1717
Also see the related repositories:
1818
* [fxtf-drafts github repository](https://github.com/w3c/fxtf-drafts/) - [fxtf mercurial repository](https://hg.fxtf.org/drafts/) - [FX Task Force generated specification index](https://drafts.fxtf.org/)
1919
* [css-houdini-drafts github repository](https://github.com/w3c/css-houdini-drafts/) - [css-houdini mercurial repository](https://hg.css-houdini.org/drafts/) - [CSS-TAG Houdini Task Force generated specification index](https://drafts.css-houdini.org/)
20+

css-align-3/Overview.bs

Lines changed: 115 additions & 102 deletions
Large diffs are not rendered by default.

css-animations-1/Overview.bs

Lines changed: 76 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Previous Version: https://www.w3.org/TR/2012/WD-css3-animations-20120403/
2727
Editor: Dean Jackson, Apple Inc., dino@apple.com, w3cid 42080
2828
Editor: L. David Baron, Mozilla https://www.mozilla.org/, https://dbaron.org/, w3cid 15393
2929
Editor: Tab Atkins Jr., Google, http://xanthir.com/contact/, w3cid 42199
30-
Editor: Brian Birtles, Mozilla, bbirtles@mozilla.com, w3cid 43194
30+
Editor: Brian Birtles, Invited Expert, brian@birchill.co.jp, w3cid 43194
3131
Former Editor: David Hyatt, Apple Inc.
3232
Former Editor: Chris Marrin, Apple Inc.
3333
Former Editor: Sylvain Galineau, Adobe, galineau@adobe.com
@@ -248,31 +248,31 @@ Keyframes</h2>
248248
so the first will be ignored:
249249

250250
<pre class=lang-css>
251-
@keyframes foo { ... }
252-
@keyframes "foo" { ... }
251+
@keyframes foo { /* ... */ }
252+
@keyframes "foo" { /* ... */ }
253253
</pre>
254254

255255
On the other hand,
256256
the following ''@keyframes'' rule's name is <em>different</em> from the previous two rules:
257257

258258
<pre class=lang-css>
259-
@keyframes FOO { ... }
259+
@keyframes FOO { /* ... */ }
260260
</pre>
261261

262262
The following ''@keyframes'' rules are invalid
263263
because they use disallowed <<custom-ident>> values:
264264

265265
<pre class=lang-css>
266-
@keyframes initial { ... }
267-
@keyframes None { ... }
266+
@keyframes initial { /* ... */ }
267+
@keyframes None { /* ... */ }
268268
</pre>
269269

270-
However, those names *can* be specified with a <<string>>,
270+
However, those names <em>can</em> be specified with a <<string>>,
271271
so the following are both <em>valid</em>:
272272

273273
<pre class=lang-css>
274-
@keyframes "initial" { ... }
275-
@keyframes "None" { ... }
274+
@keyframes "initial" { /* ... */ }
275+
@keyframes "None" { /* ... */ }
276276
</pre>
277277
</div>
278278

@@ -295,58 +295,62 @@ Keyframes</h2>
295295
the last one in document order wins,
296296
and all preceding ones are ignored.
297297

298-
<div class='example'>
299-
<pre>
300-
div {
301-
animation-name: slide-right;
302-
animation-duration: 2s;
303-
}
298+
<div class='example'>
299+
<pre>
300+
div {
301+
animation-name: slide-right;
302+
animation-duration: 2s;
303+
}
304304

305-
@keyframes slide-right {
305+
@keyframes slide-right {
306306

307-
from {
308-
margin-left: 0px;
309-
}
307+
from {
308+
margin-left: 0px;
309+
}
310310

311-
50% {
312-
margin-left: 110px;
313-
opacity: 1;
314-
}
311+
50% {
312+
margin-left: 110px;
313+
opacity: 1;
314+
}
315315

316-
50% {
317-
opacity: 0.9;
318-
}
316+
50% {
317+
opacity: 0.9;
318+
}
319319

320-
to {
321-
margin-left: 200px;
322-
}
320+
to {
321+
margin-left: 200px;
322+
}
323323

324-
}
325-
</pre>
324+
}
325+
</pre>
326326

327-
At the 1s mark, the slide-right animation will have the same state as if we had defined the 50% rule like this:
327+
The two 50% rules from above can also be combined into an equivalent single rule
328+
as illustrated below:
328329

329-
<pre>
330+
<pre>
330331

331-
@keyframes slide-right {
332+
@keyframes slide-right {
332333

333-
50% {
334-
margin-left: 110px;
335-
opacity: 0.9;
336-
}
334+
from {
335+
margin-left: 0px;
336+
}
337337

338-
to {
339-
margin-left: 200px;
340-
}
338+
50% {
339+
margin-left: 110px;
340+
opacity: 0.9;
341+
}
341342

342-
}
343-
</pre>
343+
to {
344+
margin-left: 200px;
345+
}
344346

345-
</div>
347+
}
348+
</pre>
349+
</div>
346350

347351
To determine the set of keyframes, all of the values in the selectors are sorted in increasing order
348-
by time. The rules within the @keyframes rule then cascade; the properties of a keyframe may thus derive
349-
from more than one @keyframes rule with the same selector value.
352+
by time. The rules within the ''@keyframes'' rule then cascade; the properties of a keyframe may thus derive
353+
from more than one ''@keyframes'' rule with the same selector value.
350354

351355
If a property is not specified for a keyframe, or is specified but invalid, the animation of that
352356
property proceeds as if that keyframe did not exist. Conceptually, it is as if a set of keyframes is
@@ -509,26 +513,27 @@ The 'animation-duration' property</h3>
509513
Canonical order: per grammar
510514
</pre>
511515

512-
<dl>
513-
<dt><dfn value for=animation-duration><<time>></dfn>
514-
<dd>
515-
The <<time>> specifies the length of time that an animation takes to complete one cycle.
516-
A negative <<time>> is invalid.
517-
518-
If the <<time>> is ''0s'', like the initial value,
519-
the keyframes of the animation have no effect,
520-
but the animation itself still occurs instantaneously.
521-
Specifically, start and end events are fired; if
522-
'animation-fill-mode' is set to ''backwards'' or
523-
''both'', the first frame of the animation, as defined by
524-
'animation-direction', will be displayed during the
525-
'animation-delay'. Then the last frame of the animation,
526-
as defined by 'animation-direction', will be displayed if
527-
'animation-fill-mode' is set to ''forwards'' or ''both''. If
528-
'animation-fill-mode' is set to ''animation-fill-mode/none''
529-
then the animation has no visible effect.
530-
</dd>
531-
</dl>
516+
<dl>
517+
<dt><dfn value for=animation-duration><<time>></dfn>
518+
<dd>
519+
The <<time>> specifies the length of time that an animation takes to complete one cycle.
520+
A negative <<time>> is invalid.
521+
522+
If the <<time>> is ''0s'', like the initial value,
523+
the keyframes of the animation have no effect,
524+
but the animation itself still occurs instantaneously.
525+
Specifically, start and end events are fired;
526+
if 'animation-fill-mode' is set to ''backwards'' or ''both'',
527+
the first frame of the animation,
528+
as defined by 'animation-direction',
529+
will be displayed during the 'animation-delay'.
530+
After the 'animation-delay' the last frame of the animation,
531+
as defined by 'animation-direction',
532+
will be displayed if 'animation-fill-mode' is set to ''forwards'' or ''both''.
533+
If 'animation-fill-mode' is set to ''animation-fill-mode/none''
534+
the animation will have no visible effect.
535+
</dd>
536+
</dl>
532537

533538
<h3 id="animation-timing-function">
534539
The 'animation-timing-function' property</h3>
@@ -719,7 +724,7 @@ The 'animation-delay' property</h3>
719724
Initial: 0s
720725
Applies to: all elements
721726
Inherited: no
722-
Animatable: no
727+
Animation type: not animatable
723728
Percentages: N/A
724729
Computed value: list, each item a duration
725730
Canonical order: per grammar
@@ -1156,9 +1161,10 @@ The <code>appendRule</code> method</h4>
11561161
<h4 id="interface-csskeyframesrule-deleterule">
11571162
The <code>deleteRule</code> method</h4>
11581163

1159-
The <dfn method for="CSSKeyframesRule" lt="deleteRule(select)">deleteRule</dfn> method deletes the
1160-
last declared {{CSSKeyframeRule}} matching the specified keyframe selector.
1161-
If no matching rule exists, the method does nothing.
1164+
The <dfn method for="CSSKeyframesRule" lt="deleteRule(select)">deleteRule</dfn> method
1165+
deletes the last declared {{CSSKeyframeRule}}
1166+
matching the specified keyframe selector.
1167+
If no matching rule exists, the method does nothing.
11621168

11631169
Parameters:
11641170

css-backgrounds-3/Overview.bs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ value associated with the bottom-most background image layer.
252252
<td>N/A
253253
<tr>
254254
<th>Computed value:
255-
<td>as specified, but with URIs made absolute
255+
<td>computed <<image>>
256256
<tr>
257257
<th>Animation type:
258258
<td>discrete
@@ -615,15 +615,15 @@ their initial position (after any <a href="#the-background-size">resizing</a>)
615615
within their corresponding <span>background positioning area.</span>
616616

617617
<p>Where
618-
<pre class=prod><dfn><<bg-position>></dfn> = [
618+
<pre class=prod><dfn><<bg-position>></dfn> =
619619
[ left | center | right | top | bottom | <<length-percentage>> ]
620620
|
621621
[ left | center | right | <<length-percentage>> ]
622622
[ top | center | bottom | <<length-percentage>> ]
623623
|
624624
[ center | [ left | right ] <<length-percentage>>? ] &amp;&amp;
625625
[ center | [ top | bottom ] <<length-percentage>>? ]
626-
]</pre>
626+
</pre>
627627

628628
<p>If only one value is specified, the second value is assumed to be
629629
''center''. If two values are given, a <<length-percentage>> as the first
@@ -2210,7 +2210,7 @@ this:
22102210
<td>N/A
22112211
<tr>
22122212
<th>Computed value:
2213-
<td>the keyword ''border-image-source/none'' or the specified image with URIs made absolute
2213+
<td>the keyword ''border-image-source/none'' or the computed <<image>>
22142214
<tr>
22152215
<th>Animation type:
22162216
<td>discrete

css-backgrounds-4/Overview.bs

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Corner Shaping: the 'corner-shape' property</h3>
253253

254254
<pre class="propdef">
255255
Name: corner-shape
256-
Value: [ round | bevel | scoop | notch ]{1,4}
256+
Value: [ round | angle ]{1,4}
257257
Initial: round
258258
Applies to: all elements, except table element when 'border-collapse' is ''collapse''
259259
Inherited: no
@@ -268,33 +268,47 @@ Corner Shaping: the 'corner-shape' property</h3>
268268
<dl dfn-type="value" dfn-for="corner-shape">
269269
<dt><dfn>''round''</dfn>
270270
<dd>Border radii define a convex elliptical curve at the corner.
271-
<dt><dfn>''bevel''</dfn>
271+
<dt><dfn>''angle''</dfn>
272272
<dd>Border radii define a diagonal slice at the corner.
273-
<dt><dfn>''scoop''</dfn>
274-
<dd>Border radii define a concave elliptical curve at the corner.
275-
<dt><dfn>''notch''</dfn>
276-
<dd>Border radii define a concave rectangular notch at the corner.
277273
</dl>
278274

279275
<div class="example">
280276
For example, the following declarations create a right-pointing next button.
281277
<pre>
282278
a {
283-
border-radius: 0 2em 2em 0;
284-
corner-shape: bevel;
285-
padding: 0.5em 2em 0.5em 0.5em;
279+
border-radius: .3em .8em .8em .3em / .3em 50% 50% .3em;
280+
corner-shape: round angle angle round;
281+
padding: .5em 1em .5em .5em;
282+
}
286283
</pre>
284+
<div style='font: bold 200%/1 sans-serif;
285+
width: 2.3em;
286+
width: min-content;
287+
white-space: nowrap;
288+
padding: .5em 1em .5em .5em;
289+
border-radius: .3em 0 0 .3em;
290+
background: url(&apos;data:image/svg+xml,\
291+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 40">\
292+
<path d="m 0 0 h 65 l 10 20 l -10 20 h -65 z" fill="yellowgreen" />\
293+
</svg>&apos;) no-repeat 0 / auto 100%'>
294+
Next
295+
</div>
287296
As a fallback in UAs that don't support 'border-radius',
288-
the right side would be rounded rather than pointy.
297+
the right side would be rounded rather than pointy:
298+
<div style='font: bold 200%/1 sans-serif;
299+
width: 2.3em;
300+
width: min-content;
301+
white-space: nowrap;
302+
padding: .5em 1em .5em .5em;
303+
border-radius: .3em .8em .8em .3em / .3em 50% 50% .3em;
304+
background: yellowgreen'>
305+
Next
306+
</div>
289307
</div>
290308

291309
<p class="issue">
292-
For ''scoop'' and ''notch'', how do the color/style/width transitions work?
293-
Do they transition once in the middle, or alternate to match the topness/sideness of that segment of the border?
294-
295-
<p class="issue">
296-
Add a ''cubic-bezier()'' function for random other shapes?
297-
Or some other functions?
310+
How to allow custom corners? Perhaps a ''path()'' function? Or a ''cubic-bezier()''?
311+
Something else?
298312

299313
<h3 id="corners-shorthand">
300314
Corner Shape and Size: the 'corners' shorthand</h3>
@@ -309,7 +323,7 @@ Corner Shape and Size: the 'corners' shorthand</h3>
309323

310324
<div class="example">
311325
For example, the following declaration creates a diamond shape.
312-
<pre>corners: bevel 50%;</pre>
326+
<pre>corners: angle 50%;</pre>
313327
In UAs that don't support 'corner-shape', the declaration is ignored
314328
(falls back to a rectangle).
315329
</div>
@@ -319,7 +333,7 @@ Corner Shape and Size: the 'corners' shorthand</h3>
319333
while the second example makes them trapezoid-shaped in UAs that support 'corners'.
320334
<pre>
321335
border-radius: 0.25em 0.25em 0 0;
322-
corners: bevel 0.25em 0.25em 0 0 / 50% 50% 0 0;
336+
corners: angle 0.25em 0.25em 0 0 / 50% 50% 0 0;
323337
</pre>
324338
</div>
325339

@@ -386,11 +400,11 @@ Partial Borders: the 'border-limit' property</h3>
386400
<p>The following example draws only the first 10px of each corner:</p>
387401
<pre>box { border: solid; border-parts: corners 10px; }</pre>
388402
<p>The following example draws the curved part of the corner plus 5px
389-
along ths sides:</p>
390-
<pre>box { border: solid; border-radius: 5px; border-shape: scoop; border-parts: corners 5px; }</pre>
403+
along the sides:</p>
404+
<pre>box { border: solid; border-radius: 5px; border-shape: round; border-parts: corners 5px; }</pre>
391405
<p>The following example draws the curved part of the corner and all of
392406
the side except the middle 40%.</p>
393-
<pre>box { border: solid; border-radius: 5px; border-shape: scoope; border-parts: corners 30%; }</pre>
407+
<pre>box { border: solid; border-radius: 5px; border-shape: round; border-parts: corners 30%; }</pre>
394408
</div>
395409

396410
<h3 id="border-clip">

0 commit comments

Comments
 (0)