Skip to content

Commit ee87eb9

Browse files
committed
Merge branch 'main' into selecticons
2 parents 665e052 + 83a5d07 commit ee87eb9

File tree

22 files changed

+1022
-595
lines changed

22 files changed

+1022
-595
lines changed

css-anchor-position-1/Overview.bs

Lines changed: 311 additions & 276 deletions
Large diffs are not rendered by default.

css-borders-4/Overview.bs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Editor: Bert Bos, W3C, bert@w3.org, w3cid 3343
1010
Editor: Elika J. Etemad / fantasai, Apple, http://fantasai.inkedblade.net/contact, w3cid 35400
1111
Editor: Lea Verou, Invited Expert, http://lea.verou.me/about/, w3cid 52258
1212
Editor: Sebastian Zartner, Invited Expert, sebastianzartner@gmail.com, w3cid 64937
13+
Editor: Noam Rosenthal, Google, w3cid 121539
1314
Abstract: This module contains the features of CSS relating to the borders and decorations of boxes on the page.
1415
Ignored Terms: total width
1516
Warning: Not Ready

css-conditional-3/Overview.bs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ Title: CSS Conditional Rules Module Level 3
33
Group: csswg
44
Shortname: css-conditional
55
Level: 3
6-
Status: CRD
7-
Prepare for TR: yes
8-
Date: 2024-08-15
6+
Status: ED
7+
Prepare for TR: no
98
Work Status: Testing
109
Implementation Report: https://test.csswg.org/harness/results/css-conditional-3_dev/grouped/
1110
Implementation Report: https://wpt.fyi/results/css/css-conditional?label=master&label=experimental&aligned

css-conditional-5/Overview.bs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Default Highlight: css
4343
spec:css-contain-2; type:dfn; text:layout containment box
4444
spec:css-contain-2; type:dfn; text:size containment box
4545
spec:css-pseudo-4; type:dfn; text:fictional tag sequence
46+
spec:css-scroll-snap-2; type:dfn; text:scrollsnapchanging
4647
spec:css-sizing-4; type:property; text:contain-intrinsic-size
4748
spec:css-sizing-4; type:property; text:aspect-ratio
4849
spec:intersection-observer; type:dfn; text:intersection root
@@ -878,7 +879,7 @@ Size Container Features</h3>
878879
allows querying
879880
the size of the [=query container=]’s [=principal box=].
880881
It is a boolean combination of
881-
individual <dfn>size features</dfn> (<<size-feature>>)
882+
individual <dfn export>size features</dfn> (<<size-feature>>)
882883
that each query a single, specific dimensional feature of the [=query container=].
883884
The syntax of a <dfn><<size-feature>></dfn> is the same as for a [=media feature=]:
884885
a feature name, a comparator, and a value.
@@ -1195,7 +1196,8 @@ Scroll snapping: the '@container/snapped' feature</h4>
11951196
</pre>
11961197

11971198
The '@container/snapped' [=container feature=] queries whether a [=snap target=]
1198-
is snapped to its [=snap container=] in the given axis.
1199+
is, or would be, snapped to its [=snap container=], in the given axis. That is,
1200+
it matches any [=snap target=] that the {{scrollsnapchanging}} event is fired for.
11991201

12001202
<dl dfn-type=value dfn-for="@container/snapped">
12011203
<dt><dfn>none</dfn>

css-fonts-4/Overview.bs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,13 +4060,13 @@ UAs may alternatively choose
40604060
to not initially expose any user-installed fonts to aid privacy on the web;
40614061
for the set of installed fonts a user has installed
40624062
is often used as a tracking vector to track users across the web.
4063-
Users would then add to add to or remove fonts from that set,
4063+
Users should then be able to add to or remove fonts from that set,
40644064
according to their needs.
40654065

40664066
UAs may choose a hybrid approach, where some user-installed fonts
40674067
are initially exposed for internationalization,
40684068
but others aren't.
4069-
Again, users would be able to customise this starting set.
4069+
Again, users should be able to customise this starting set.
40704070

40714071
UAs are expected to make informed decisions
40724072
on which fonts they expose to the web by default,

css-forms-1/Overview.bs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,51 @@ Abstract: This document is currently a loosely-structured set of ideas and inspi
1111
Warning: not ready
1212
</pre>
1313

14+
New Pseudo-Elements {#pseudos}
15+
==============================
16+
17+
This section defines some pseudo-elements for styling parts of form elements.
18+
19+
<h3 id="picker-pseudo">
20+
Styling form control pickers: the ''::picker()'' pseudo-element</h3>
21+
22+
The <dfn>::picker()</dfn> pseudo-element targets the popup picker of form
23+
control elements which have popup pickers, such as the <{select}> element. It
24+
is an [=element-backed pseudo-element=].
25+
26+
<pre class=prod>
27+
::picker() = ::picker( <<ident>>+ )
28+
</pre>
29+
30+
Note: Once all of the controls that might support picker styling have it,
31+
then we might add a (no-argument) ''::picker'' pseudo-element as well.
32+
33+
The ''::picker()'' pseudo-element only matches when the <a>originating
34+
element</a> supports <a>base appearance</a> and has a popup picker. The
35+
specified <<ident>> must also match the <dfn>unique picker name</dfn> of the
36+
<a>originating element</a>. For example, the <a>unique picker name</a> for
37+
the <{select}> element is "select".
38+
39+
Since it is an [=element-backed pseudo-element=], There is no restriction on which
40+
properties apply to the ''::picker()'' pseudo-element.
41+
42+
In order for the ''::picker()'' pseudo-element to be rendered, it and its
43+
<a>originating element</a> must be rendered with <a>base appearance</a> by
44+
applying ''appearance: base'' to both of them.
45+
46+
<pre class="example">
47+
&lt;style>
48+
select, select::picker(select) {
49+
appearance: base;
50+
}
51+
select::picker(select) {
52+
border: 5px solid red;
53+
background-color: blue;
54+
}
55+
&lt;/style>
56+
</pre>
57+
58+
1459
Basic Styling Proposals {#ideas}
1560
================================
1661

css-grid-2/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5554,7 +5554,7 @@ Changes since the
55545554
for previous changes.
55555555

55565556
<h3 id="changes-2">
5557-
Additions Since Level 2</h3>
5557+
Additions Since Level 1</h3>
55585558

55595559
The following features have been added since
55605560
<a href="http://www.w3.org/TR/css-grid-1/">Level 1</a>:

css-grid-3/Overview.bs

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
Title: CSS Grid Layout Module Level 3
33
Shortname: css-grid
44
Level: 3
5-
Status: FPWD
6-
Prepare for TR: yes
7-
Date: 2024-09-19
5+
Status: ED
86
Work Status: Exploring
97
Group: csswg
108
TR: https://www.w3.org/TR/css-grid-3/
@@ -677,6 +675,10 @@ Masonry Track Specification</h3>
677675
<h4 id=masonry-intrinsic-repeat>
678676
Intrinsic Tracks and repeat()</h4>
679677

678+
ISSUE(10915): Should we allow auto-repeated content-based tracks?
679+
Is this a reasonable definition for them?
680+
Should they work also in Grid Layout somehow?
681+
680682
In Grid Layout,
681683
all [=grid items=] are placed in the grid
682684
<em>before</em> the grid tracks are sized.
@@ -862,18 +864,20 @@ repeat(auto-areas)</h3>
862864
the final repetition is truncated as necessary
863865
to produce the correct number of tracks.
864866

865-
Note: Unlike ''repeat()/auto-fill''--
867+
Note: Unlike ''repeat()/auto-fit''--
866868
which always repeats at least once and always repeats the track listing entirely--
867869
the number of repetitions for ''repeat()/auto-areas'' can be zero
868870
(if there are already enough explicit tracks),
869871
and the final repetition can be partial.
870872

871873
If 'grid-template-areas' / 'masonry-template-areas' is ''grid-template-areas/none'',
872-
this value behaves as ''auto-fill''.
874+
this value behaves as ''auto-fit''.
873875

874876
Note: This value applies both to regular [=grid containers=] and to [=masonry containers=].
875877

876878
ISSUE(10854): It's unclear if we actually need this value.
879+
Note that the explicit grid already takes values from 'grid-auto-columns'/'grid-auto-rows'/'masonry-auto-tracks'
880+
as needed to match the number of template areas.
877881

878882
<h4 id="repeat-auto-fit">
879883
repeat(auto-fit)</h3>
@@ -1421,31 +1425,6 @@ Absolute Positioning</h2>
14211425
Maybe it could defined as the max (or min?) current [=running position=]
14221426
of the [=grid-axis=] tracks at that point? Or the end of the item before it?
14231427

1424-
<h2 id="performance-notes">
1425-
Performance Notes</h2>
1426-
1427-
In general, masonry layout should have significantly better performance
1428-
than the equivalent regular (2-axis) grid layout,
1429-
particularly when the [=stacking axis=] is the [=block axis=]
1430-
since the intrinsic sizing of grid rows is typically quite expensive.
1431-
Any intrinsic track sizing in the [=grid axis=] should be cheaper too,
1432-
because, typically, only a subset of items contribute to the intrinsic sizing in a masonry layout,
1433-
contrary to a 2-axis grid where all items spanning an intrinsically-sized track contribute.
1434-
Stretched items do a second layout with the new size (when it actually changed)
1435-
so this can be costly if there are a huge amount of stretched items
1436-
that each contains a lot of content.
1437-
Especially nested stretched masonry layouts should be avoided
1438-
unless they are small/trivial.
1439-
1440-
Advisement: This can be ameliorated by the author
1441-
by opting out from the stretching on most items though,
1442-
e.g. specifying ''justify/align-items:start''
1443-
and then opting in for just a few items with ''justify/align-self:stretch''
1444-
to let those items fill the [=stacking axis=].
1445-
(This performance analysis is from a Gecko perspective,
1446-
but I suspect there's some truth to it for other layout engines as well.)
1447-
1448-
14491428
<h2 id="graceful-degradation">
14501429
Graceful Degradation</h2>
14511430

@@ -1478,25 +1457,49 @@ Graceful Degradation</h2>
14781457
Acknowledgements</h2>
14791458

14801459
Thanks goes to Cameron McCormack who wrote a masonry layout explainer document
1481-
(from which I lifted the Background chapter) and presented it to the CSSWG.
1460+
(from which was lifted the Background chapter) and presented it to the CSSWG,
1461+
and to Mats Palmgren who developed the original version of this specification.
14821462
Thanks also to everyone who provided feedback on the <a href="https://github.com/w3c/csswg-drafts/issues/4650">initial proposal</a> for this feature.
14831463

14841464
<h2 id=security>
14851465
Security Considerations</h2>
14861466

1487-
<p>
14881467
As a layout specification,
14891468
this spec introduces no new security considerations
14901469
beyond that exposed by CSS layout in general.
1491-
</p>
14921470

14931471
<h2 id=privacy>
14941472
Privacy Considerations</h2>
14951473

1496-
<p>
14971474
As a layout specification,
14981475
this spec introduces no new privacy considerations
14991476
beyond that exposed by CSS layout in general.
1500-
</p>
15011477

1502-
<wpt-rest></wpt-rest>
1478+
<h2 class="no-num" id="changes">
1479+
Changes</h2>
1480+
1481+
1482+
<h3 id="changes-3">
1483+
Additions Since Level 2</h3>
1484+
1485+
The following features have been added since
1486+
<a href="http://www.w3.org/TR/css-grid-2/">Level 2</a>:
1487+
1488+
<ul>
1489+
<li>Added [=masonry layout=].
1490+
<li>Added ''*-reverse'' keywords to 'grid-auto-flow'.
1491+
</ul>
1492+
1493+
<h3 class="no-num" id="recent-changes">
1494+
Recent Changes</h3>
1495+
1496+
The following changes have been made since the
1497+
<a href='https://www.w3.org/TR/2024/WD-css-grid-3-20240919/'>First Public Working Draft</a>:
1498+
1499+
* Drafted ability to mix ''auto-fill''/''auto-fit'' ''repeat()'' values with content-based track sizes
1500+
in the [=grid-independent option=] and made it the initial behavior 'masonry-template-tracks'.
1501+
(Issues <a href="https://github.com/w3c/csswg-drafts/issues/10915">10915</a>,
1502+
and <a href="https://github.com/w3c/csswg-drafts/issues/10869">10869</a>)
1503+
* Added ''masonry-slack: infinite''.
1504+
(<a href="https://github.com/w3c/csswg-drafts/issues/10883">Issue 10883</a>)
1505+
* Minor corrections, updated acknowledgements, and added an example.

css-highlight-api-1/Overview.bs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Setting up Custom Highlights</h2>
141141
<h3 id=creation>
142142
Creating Custom Highlights</h3>
143143

144-
A <dfn>custom highlight</dfn> is a collection of [=ranges=]
144+
A <dfn export>custom highlight</dfn> is a collection of [=ranges=]
145145
representing portions of a document.
146146
They do not necessarily fit into the element tree,
147147
and can arbitrarily cross element boundaries without honoring its nesting structure.
@@ -246,7 +246,7 @@ Registering Custom Highlights</h3>
246246
the passed-in [=custom highlight name=] as <var ignore>keyArg</var>,
247247
and the passed-in highlight as <var ignore>valueArg</var>.
248248

249-
The <dfn>custom highlight name</dfn> assigned to a [=custom highlight=] when it is [=registered=]
249+
The <dfn export>custom highlight name</dfn> assigned to a [=custom highlight=] when it is [=registered=]
250250
is used to identify the highlight during styling (see [[#styling-highlights]]).
251251

252252
Note: When registering a [=custom highlight=],
@@ -304,15 +304,12 @@ Styling Custom Highlights</h2>
304304
<h3 id=custom-highlight-pseudo>
305305
The Custom Highlight Pseudo-element: ''::highlight()''</h3>
306306

307-
The <dfn>::highlight(<<custom-highlight-name>>)</dfn> pseudo-element
307+
The ''::highlight()'' pseudo-element
308308
(also known as the <dfn>custom highlight pseudo-element</dfn>)
309309
represents the portion of a document that
310310
is being [=contained=] or [=partially contained=]
311311
in all the [=ranges=] of the [=registered=] [=custom highlight=]
312-
with the [=custom highlight name=] <<custom-highlight-name>>,
313-
if any.
314-
<dfn type><<custom-highlight-name>></dfn> must be a valid CSS <<ident-token>>.
315-
312+
with the [=custom highlight name=] specified as its argument.
316313

317314
<h3 id=processing-model>
318315
Processing Model</h3>

css-nesting-1/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ Nesting Selector: the ''&'' selector {#nest-selector}
10271027

10281028
<pre class=lang-css>
10291029
.a1, .a2, .a3 {
1030-
.b1, .b3, .b3 {
1030+
.b1, .b2, .b3 {
10311031
.c1, .c2, .c3 {
10321032
...;
10331033
}

0 commit comments

Comments
 (0)