Skip to content

Commit 770d623

Browse files
author
Greg Whitworth
committed
Merge branch 'master' of github.com:w3c/csswg-drafts
2 parents b635c22 + 39d8d53 commit 770d623

File tree

23 files changed

+895
-424
lines changed

23 files changed

+895
-424
lines changed

Transitions.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#W3C Transition status
2+
3+
##First Public Working Draft
4+
5+
###Open
6+
7+
_(none)_
8+
9+
###Closed
10+
11+
_(none)_
12+
13+
##Candidate Recommendation
14+
15+
###Open
16+
17+
Paint API
18+
* [group decision](https://lists.w3.org/Archives/Public/public-houdini/2016Oct/0001.html) 09 Oct 2016
19+
* next step: transition request
20+
21+
CSS Scroll Snapping
22+
* [transition request](https://lists.w3.org/Archives/Member/chairs/2016OctDec/0000.html) 03 Oct 2016
23+
* transition approved, 13 Oct 2016
24+
* next step: publication, Tue 18 Oct 2016
25+
26+
###Closed
27+
28+
CSS Values & Units 3 [done](https://www.w3.org/TR/css-values-3/), 29 September 2016
29+
30+
CSS Grid Layout 1 [done](https://www.w3.org/TR/css-grid-1/), 29 September 2016
31+
32+
##Proposed Recommendation
33+
34+
###Open
35+
36+
_(none)_
37+
38+
###Closed
39+
40+
_(none)_

css-align/Overview.bs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ Inline/Main-Axis Alignment: the 'justify-self' property</h3>
851851
the box's outer edges are aligned within its <a>alignment container</a>
852852
<a href="#alignment-values">as described by its alignment value</a>.
853853

854-
The <dfn value for="justify-self">auto</dfn> keyword is interpretead as
854+
The <dfn value for="justify-self">auto</dfn> keyword is interpreted as
855855
''justify-self/normal'' if the box is absolutely positioned or has no parent,
856856
and as the computed value of 'justify-items' on the parent
857857
(minus any ''legacy'' keywords)
@@ -1055,7 +1055,7 @@ Block/Cross-Axis Alignment: the 'align-self' property</h3>
10551055
the box's outer edges are aligned within its <a>alignment container</a>
10561056
<a href="#alignment-values">as described by its alignment value</a>.
10571057

1058-
The <dfn value for="align-self">auto</dfn> keyword is interpretead as
1058+
The <dfn value for="align-self">auto</dfn> keyword is interpreted as
10591059
''align-self/normal'' if the box is absolutely positioned or has no parent,
10601060
and as the computed value of 'align-items' on the parent
10611061
otherwise.

css-animations-2/Overview.bs

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Level: 2
4343
Group: csswg
4444
ED: https://drafts.csswg.org/css-animations-2/
4545
Editor: L. David Baron, Mozilla, dbaron@dbaron.org
46+
Editor: Brian Birtles, Mozilla https://www.mozilla.org/, bbirtles@mozilla.com
4647
!Issues List: <a href="https://www.w3.org/Bugs/Public/buglist.cgi?component=Animations&list_id=36653&product=CSS&query_format=advanced&resolution=---">In Bugzilla</a>
4748
4849
Abstract: This CSS module describes a way for authors to animate the values of CSS properties over time, using keyframes. The behavior of these keyframe animations can be controlled by specifying their duration, number of repeats, and repeating behavior.
@@ -77,6 +78,7 @@ urlPrefix: https://w3c.github.io/web-animations/; type: dfn; spec: web-animation
7778
text: iteration duration
7879
text: iteration start
7980
text: pause an animation
81+
text: pending play state
8082
text: play an animation
8183
text: sampling
8284
text: start delay
@@ -419,9 +421,9 @@ definitions are used:
419421
<code>max(min(<a>target effect end</a> - <a>start delay</a>,
420422
<a>active duration</a>), 0)</code>
421423
422-
Each time an animation is <a lt="sampling">sampled</a>, the events to
423-
dispatch are determined by comparing the animation's phase before and
424-
after the sample as follows:
424+
Each time an animation is <a lt="sampling">sampled</a> and is <em>not</em> <a
425+
lt="pending play state">pending</a>, the events to dispatch are determined by
426+
comparing the animation's phase before and after the sample as follows:
425427
426428
<table class="event-state-transitions">
427429
<thead>
@@ -433,60 +435,32 @@ after the sample as follows:
433435
</thead>
434436
<tbody>
435437
<tr>
436-
<td><a lt="idle phase">idle</a> &rarr;
438+
<td><a lt="idle phase">idle</a> or <a lt="before phase">before</a> &rarr;
437439
<a lt="active phase">active</a></td>
438440
<td><a idl>animationstart</a></td>
439-
<td>If the <a>animation playback rate</a> is &ge; 0,
440-
use the <a>interval start</a>, otherwise use the
441-
<a>interval end</a>.
441+
<td><a>interval start</a>
442442
</td>
443443
</tr>
444444
<tr>
445-
<td><a lt="before phase">before</a> &rarr;
446-
<a lt="active phase">active</a></td>
447-
<td><a idl>animationstart</a></td>
448-
<td><a>interval start</a></td>
449-
</tr>
450-
<tr>
451-
<td><a lt="after phase">after</a> &rarr;
452-
<a lt="active phase">active</a></td>
453-
<td><a idl>animationstart</a></td>
454-
<td><a>interval end</a></td>
455-
</tr>
456-
<tr>
457-
<td rowspan="2"><a lt="before phase">before</a> &rarr;
458-
<a lt="after phase">after</a> <a
459-
href="#multiple-events-note">&#x66d;</a></td>
460-
<td><a idl>animationstart</a></td>
461-
<td><a>interval start</a></td>
462-
</tr>
463-
<tr>
464-
<td><a idl>animationend</a></td>
465-
<td><a>interval end</a></td>
466-
</tr>
467-
<tr>
468-
<td rowspan="2"><a lt="after phase">after</a> &rarr;
469-
<a lt="before phase">before</a> <a
470-
href="#multiple-events-note">&#x66d;</a></td>
445+
<td rowspan="2">
446+
<a lt="idle phase">idle</a> or <a lt="before phase">before</a> &rarr;
447+
<a lt="after phase">after</a> <a
448+
href="#multiple-events-note">&#x66d;</a></td>
471449
<td><a idl>animationstart</a></td>
472-
<td><a>interval end</a></td>
450+
<td><a>interval start</a>
451+
</td>
473452
</tr>
474453
<tr>
475454
<td><a idl>animationend</a></td>
476-
<td><a>interval start</a></td>
455+
<td><a>interval end</a>
456+
</td>
477457
</tr>
478458
<tr>
479459
<td><a lt="active phase">active</a> &rarr;
480460
<a lt="before phase">before</a></td>
481461
<td><a idl>animationend</a></td>
482462
<td><a>interval start</a></td>
483463
</tr>
484-
<tr>
485-
<td><a lt="active phase">active</a> &rarr;
486-
<a lt="after phase">after</a></td>
487-
<td><a idl>animationend</a></td>
488-
<td><a>interval end</a></td>
489-
</tr>
490464
<tr>
491465
<td><a lt="active phase">active</a> &rarr;
492466
<a lt="active phase">active</a>
@@ -498,6 +472,29 @@ after the sample as follows:
498472
<td>(See below)
499473
<a href="#animation-iteration-elapsed-time">&dagger;</a></td>
500474
</tr>
475+
<tr>
476+
<td><a lt="active phase">active</a> &rarr;
477+
<a lt="after phase">after</a></td>
478+
<td><a idl>animationend</a></td>
479+
<td><a>interval end</a></td>
480+
</tr>
481+
<tr>
482+
<td><a lt="after phase">after</a> &rarr;
483+
<a lt="active phase">active</a></td>
484+
<td><a idl>animationstart</a></td>
485+
<td><a>interval end</a></td>
486+
</tr>
487+
<tr>
488+
<td rowspan="2"><a lt="after phase">after</a> &rarr;
489+
<a lt="before phase">before</a> <a
490+
href="#multiple-events-note">&#x66d;</a></td>
491+
<td><a idl>animationstart</a></td>
492+
<td><a>interval end</a></td>
493+
</tr>
494+
<tr>
495+
<td><a idl>animationend</a></td>
496+
<td><a>interval start</a></td>
497+
</tr>
501498
<tr>
502499
<td>Not <a lt="idle phase">idle</a> &rarr;
503500
<a lt="idle phase">idle</a></td>

css-animations/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ED: https://drafts.csswg.org/css-animations/
2424
Previous Version: https://www.w3.org/TR/2013/WD-css3-animations-20130219/
2525
Previous Version: https://www.w3.org/TR/2012/WD-css3-animations-20120403/
2626
Editor: Dean Jackson, Apple Inc., dino@apple.com
27-
Editor: L. David Baron, Mozilla, http://dbaron.org/
27+
Editor: L. David Baron, Mozilla https://www.mozilla.org/, https://dbaron.org/
2828
Editor: Tab Atkins Jr., Google, http://xanthir.com/contact/
2929
Editor: Brian Birtles, Mozilla Japan, bbirtles@mozilla.com
3030
Former Editor: David Hyatt, Apple Inc.

css-conditional/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ED: https://drafts.csswg.org/css3-conditional/
99
TR: https://www.w3.org/TR/css3-conditional/
1010
Previous Version: https://www.w3.org/TR/2013/CR-css3-conditional-20130404/
1111
Test Suite: http://test.csswg.org/suites/css3-conditional/nightly-unstable/
12-
Editor: L. David Baron, Mozilla http://www.mozilla.org, http://dbaron.org
12+
Editor: L. David Baron, Mozilla https://www.mozilla.org/, https://dbaron.org/
1313
Link Defaults: css-color-3 (property) color
1414
Abstract: This module contains the features of CSS for conditional processing of parts of
1515
style sheets, conditioned on capabilities of the processor or the

css-fonts-4/Overview.bs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ at least as dark as its predecessor. Only values between 1 - 999 are valid, and
192192
<tr><th>- 99</th><td>400</td><td>No change</td></tr>
193193
<tr><th>100 - 349</th><td>400</td><td>100</td></tr>
194194
<tr><th>350 - 549</th><td>700</td><td>100</td></tr>
195-
<tr><th>550 - 745</th><td>900</td><td>400</td></tr>
195+
<tr><th>550 - 749</th><td>900</td><td>400</td></tr>
196196
<tr><th>750 - 899</th><td>900</td><td>700</td></tr>
197197
<tr><th>900 -</th><td>No change</td><td>700</td></tr>
198198
</tbody>
@@ -229,15 +229,15 @@ at least as dark as its predecessor. Only values between 1 - 999 are valid, and
229229
</tr>
230230
</thead>
231231
<tbody>
232-
<tr><th>ultra-condensed</th><th>80%</th></tr>
233-
<tr><th>extra-condensed</th><th>85%</th></tr>
234-
<tr><th>condensed</th><th>90%</th></tr>
235-
<tr><th>semi-condensed</th><th>95%</th></tr>
232+
<tr><th>ultra-condensed</th><th>50%</th></tr>
233+
<tr><th>extra-condensed</th><th>62.5%</th></tr>
234+
<tr><th>condensed</th><th>75%</th></tr>
235+
<tr><th>semi-condensed</th><th>87.5%</th></tr>
236236
<tr><th>normal</th><th>100%</th></tr>
237-
<tr><th>semi-expanded</th><th>105%</th></tr>
238-
<tr><th>expanded</th><th>110%</th></tr>
239-
<tr><th>extra-expanded</th><th>115%</th></tr>
240-
<tr><th>ultra-expanded</th><th>120%</th></tr>
237+
<tr><th>semi-expanded</th><th>112.5%</th></tr>
238+
<tr><th>expanded</th><th>125%</th></tr>
239+
<tr><th>extra-expanded</th><th>150%</th></tr>
240+
<tr><th>ultra-expanded</th><th>200%</th></tr>
241241
</tbody>
242242
</table>
243243

css-grid/Overview.bs

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<h1>CSS Grid Layout Module Level 1</h1>
22

33
<pre class='metadata'>
4-
Status: ED
5-
Work Status: Refining
4+
Deadline: 2017-06-30
5+
Date: 2016-09-29
6+
Status: CR
7+
Work Status: Testing
68
Shortname: css-grid
79
Level: 1
810
Group: csswg
@@ -743,9 +745,9 @@ Reordering and Accessibility</h2>
743745
"a b c"
744746
"f f f";
745747
grid-template-columns: auto 1fr 20%; }
746-
article { grid-position: b; min-width: 12em; }
747-
nav { grid-position: a; /* auto min-width */ }
748-
aside { grid-position: c; min-width: 12em; }
748+
article { grid-area: b; min-width: 12em; }
749+
nav { grid-area: a; /* auto min-width */ }
750+
aside { grid-area: c; min-width: 12em; }
749751
</pre>
750752

751753
As an added bonus,
@@ -895,7 +897,9 @@ Sizing Grid Containers</h3>
895897

896898
In both inline and block formatting contexts,
897899
the <a>grid container</a>’s ''auto'' <a>block size</a> is its max-content size.
898-
<span class="issue">The block layout spec should define this?</span>
900+
901+
<span class="note">The block layout spec should probably define this,
902+
but it isn't written yet.</span>
899903

900904
The <a>max-content size</a> of a <a>grid container</a> is
901905
the sum of the <a>grid container’s</a> track sizes (including gutters)
@@ -3599,8 +3603,9 @@ Grid Sizing Algorithm</h3>
35993603
had that size and all other rows were infinite.
36003604

36013605
<div class="issue">
3602-
Alternatively, we could
3603-
assume the <a>available space</a> that it would have as the maximum of:
3606+
Would it help to have <a href="https://lists.w3.org/Archives/Public/www-style/2016Jan/0128.html">heuristics</a>
3607+
that attempt a more accurate initial estimate?
3608+
E.g. assuming the <a>available space</a> that it would have as the maximum of:
36043609

36053610
<ul>
36063611
<li>
@@ -3622,8 +3627,8 @@ Grid Sizing Algorithm</h3>
36223627
or a ''max-content'', ''auto'', or <<flex>> max sizing function.
36233628
</ul>
36243629

3625-
This is likely to reduce the amount of re-layout passes that are necessary,
3626-
but will it produce a different result in any cases?
3630+
This is may reduce the amount of re-layout passes that are necessary,
3631+
but will it produce a different or better result in any cases?
36273632
Should we adopt it into the spec?
36283633
</div>
36293634

@@ -3645,10 +3650,6 @@ Grid Sizing Algorithm</h3>
36453650
and <a spec=css-multicol>multi-column elements</a>.
36463651
</div>
36473652

3648-
Issue: Is one cycle enough?
3649-
3650-
Issue: Would it help to have <a href="https://lists.w3.org/Archives/Public/www-style/2016Jan/0128.html">smarter heuristics</a> for the initial size calculation?
3651-
36523653
<li>
36533654
Finally, the <a>grid container</a> is sized
36543655
using the resulting size of the <a>grid</a> as its content size,
@@ -4193,10 +4194,12 @@ Fragmenting Grid Layout</h2>
41934194
<h3 id="fragmentation-alg">
41944195
Sample Fragmentation Algorithm</h3>
41954196

4196-
<p class="issue">
4197-
This is just a rough draft.
4198-
This section needs to be severely cross-checked with the [[CSS-FLEXBOX-1]] algorithm.
4199-
Feedback overall is welcome; please reference the rules above instead as implementation guidance.
4197+
<p><em>This section is non-normative.</em>
4198+
4199+
<p class="note">
4200+
This is a rough draft of one possible fragmentation algorithm,
4201+
and still needs to be severely cross-checked with the [[CSS-FLEXBOX-1]] algorithm for consistency.
4202+
Feedback is welcome; please reference the rules above instead as implementation guidance.
42004203

42014204
<ol>
42024205
<li>
@@ -4265,6 +4268,8 @@ Acknowledgements</h2>
42654268
<h2 class="no-num" id="changes">
42664269
Changes</h2>
42674270

4271+
Changes since the <a href="https://www.w3.org/TR/2016/WD-css-grid-1-20160519/">19 May 2016 Working Draft</a> are:
4272+
42684273
<ul>
42694274
<li>Disallowed ''repeat()'' syntax in 'grid-template' shorthand syntax--
42704275
since this is somewhat incompatible with the ASCII-art design of the syntax, and was never intended to be allowed.

css-inline/Overview.bs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,9 @@ Raised and sunken caps</h4>
10651065
</figure>
10661066

10671067
Issue: Handle glyph ink above cap height of font.
1068+
Proposal: Make it an exclusion area for line boxes and border boxes. Include margin specified on initial-letter as part of exclusion area in order to control spacing.
1069+
1070+
Issue: Draw a box model diagram here. Does the margin of the initial letter collapse with its container?
10681071

10691072

10701073
<h4 id="short-para-initial-letter">
@@ -1108,7 +1111,7 @@ Interaction with floats</h4>
11081111
Floats always clear an initial letter when floated to the same side.
11091112
When floated to the opposite side,
11101113
they are pushed down to clear the initial letter
1111-
only if they have specified 'clear' to this side
1114+
only if they have specified 'clear' to the affected side
11121115
or they do not fit without overlapping the initial letter.
11131116

11141117
Issue: Is this the behavior we want? What if the float is on the same line as the initial letter?
@@ -1163,12 +1166,12 @@ Appendix A: Synthesizing Alignment Metrics</h2>
11631166
can be taken as the ideographic character face edges.
11641167
In the horizontal dimension,
11651168
the left and right edges of the nation ideograph (U+56FD “国”)
1166-
or solid ideograph (U+56FA “固”)
1169+
or reason ideograph (U+56E0 “因”)
11671170
can be used.
11681171
In all cases, the these edges should be measured
11691172
at their intersection with the central baseline in that axis.
11701173

1171-
Issue: Is 国 or 固 more common?
1174+
Issue: What is the best character to use for the sides?
11721175

11731176
<li>
11741177
The top edge of the center of the Hebrew maqaf (U+05B3 “־”)
@@ -1292,7 +1295,7 @@ Acknowledgments</h2>
12921295
Sylvain Galineau,
12931296
David Hyatt,
12941297
Shinyu Murakami,
1295-
Ted O’Connor,
1298+
Tess O’Connor,
12961299
Sujal Parikh,
12971300
Florian Rivoal,
12981301
Alan Stearns,

css-overflow-3/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Level: 3
99
TR: https://www.w3.org/TR/css-overflow-3/
1010
Previous version: https://www.w3.org/TR/2016/WD-css-overflow-3-20160531/
1111
Previous version: https://www.w3.org/TR/2013/WD-css-overflow-3-20130418/
12-
Editor: L. David Baron, Mozilla, http://dbaron.org/
12+
Editor: L. David Baron, Mozilla https://www.mozilla.org/, https://dbaron.org/
1313
Editor: Florian Rivoal, On behalf of Bloomberg, florian@rivoal.net, http://florian.rivoal.net/
1414
Abstract: This module contains the features of CSS relating to scrollable overflow handling in visual media.
1515
!Change Log: <a href="https://hg.csswg.org/drafts/log/tip/css-overflow/Overview.bs">from 27 January 2015 to the present</a>

css-overflow/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Group: csswg
88
Level: 4
99
TR: https://www.w3.org/TR/css-overflow-4/
1010
Previous version: https://www.w3.org/TR/css-overflow-3/
11-
Editor: L. David Baron, Mozilla, http://dbaron.org/
11+
Editor: L. David Baron, Mozilla https://www.mozilla.org/, https://dbaron.org/
1212
Editor: Florian Rivoal, On behalf of Bloomberg, florian@rivoal.net, http://florian.rivoal.net/
1313
Abstract: This module contains the features of CSS relating to new mechanisms of overflow handling in visual media (e.g., screen or paper). In interactive media, it describes features that allow the overflow from a fixed size container to be handled by pagination (displaying one page at a time). It also describes features, applying to all visual media, that allow the contents of an element to be spread across multiple fragments, allowing the contents to flow across multiple regions or to have different styles for different fragments.
1414
!Change Log: <a href="https://hg.csswg.org/drafts/log/tip/css-overflow/Overview.bs">from 27 January 2015 to the present</a>

0 commit comments

Comments
 (0)