Skip to content

Commit 035cd61

Browse files
authored
Merge branch 'main' into css-style-decl-split
2 parents db7d0e8 + ee0259d commit 035cd61

File tree

117 files changed

+9188
-2493
lines changed

Some content is hidden

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

117 files changed

+9188
-2493
lines changed

CONTRIBUTING.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,29 @@ issues on a regular basis; however note that sometimes this can take awhile
3939
issue and the work schedules of people involved--this does not mean we are
4040
ignoring the issue.
4141

42-
For an issue that requires WG discussion or approval, WG members can tag/label
43-
it 'Agenda+' to bring it to the Working Group's attention. Unfortunately,
42+
When issues need WG discussion or approval, WG members should label the issue
43+
'Agenda+' to bring it to the Working Group's attention. Unfortunately,
4444
GitHub doesn't allow labelling permissions without repository write permissions,
4545
so if you believe an issue is urgent or discussion has stalled for awhile and
46-
the WG's attention is needed to move forward, ask one of the editors to flag it.
46+
the WG's attention is needed to move forward, ask one of the Editors to flag it.
47+
48+
In general, you should not directly commit changes to a draft unless you are an
49+
Editor of that draft, or have their explicit permission. If you are not an
50+
Editor of a draft, but wish to contribute changes, the best practice is to either
51+
work directly with an Editor to review proposed text, or file your proposal as a
52+
pull request (PR). Substantive changes need WG consensus, not merely Editor
53+
agreement; typographic error and markup fixes are generally okay to commit, but
54+
any substantive changes should have clear WG consensus. Substantial changes or
55+
additions to non-normative text should still have clear Editor approval.
56+
57+
In any case, WG consensus is expected prior to merging changes, and consensus is
58+
determined by the Chairs (not self-assessed) via synchronous decisions during
59+
meetings, and occasionally via async CFCs. Some degree of discretion is afforded
60+
to Editors to make changes prior to WG consensus, particularly early in a spec or
61+
feature's lifecycle, although Editors must confirm those changes with the WG
62+
prior to republishing on TR. References to the discussion and the WG consensus
63+
should be placed in the issue or commit. Agreement from an Editor in an issue
64+
is not a substitute for WG consensus.
4765

4866
The Working Group, aside from managing issues on GitHub, mainly discusses
4967
specifications and requests on [the www-style public mailing list](https://lists.w3.org/Archives/Public/www-style/),

css-2023/Overview.bs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Classification of CSS Specifications</h2>
307307
<dd>
308308
Introduces a flexible linear layout model for CSS.
309309

310-
<dt><a href="https://www.w3.org/TR/css-ui-3/">CSS User Interface Module Level 3</a>
310+
<dt><a href="https://www.w3.org/TR/css-ui-3/">CSS Basic User Interface Module Level 3</a>
311311
[[!CSS-UI-3]]
312312
<dd>
313313
Extends and supersedes CSS2&sect;18.1 and CSS2&sect;18.4,
@@ -414,15 +414,15 @@ Fairly Stable Modules with limited implementation experience</h3>
414414
defining properties for text manipulation and specifying their processing model.
415415
It covers line breaking, justification and alignment, white space handling, and text transformation.
416416

417-
<dt><a href="https://www.w3.org/TR/css-text-decor-3/">CSS Text Decoration Level 3</a>
417+
<dt><a href="https://www.w3.org/TR/css-text-decor-3/">CSS Text Decoration Module Level 3</a>
418418
[[CSS-TEXT-DECOR-3]]
419419
<dd>
420420
Extends and supersedes CSS2&sect;16.3,
421421
providing more control over text decoration lines
422422
and adding the ability to specify text emphasis marks
423423
and text shadows.
424424

425-
<dt><a href="https://www.w3.org/TR/css-masking-1/">CSS Masking Level 1</a>
425+
<dt><a href="https://www.w3.org/TR/css-masking-1/">CSS Masking Module Level 1</a>
426426
[[CSS-MASKING-1]]
427427
<dd>
428428
Replaces CSS2&sect;11.1.2

css-2024/Overview.bs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Classification of CSS Specifications</h2>
306306
<dd>
307307
Introduces a flexible linear layout model for CSS.
308308

309-
<dt><a href="https://www.w3.org/TR/css-ui-3/">CSS User Interface Module Level 3</a>
309+
<dt><a href="https://www.w3.org/TR/css-ui-3/">CSS Basic User Interface Module Level 3</a>
310310
[[!CSS-UI-3]]
311311
<dd>
312312
Extends and supersedes CSS2&sect;18.1 and CSS2&sect;18.4,
@@ -413,15 +413,15 @@ Fairly Stable Modules with limited implementation experience</h3>
413413
defining properties for text manipulation and specifying their processing model.
414414
It covers line breaking, justification and alignment, white space handling, and text transformation.
415415

416-
<dt><a href="https://www.w3.org/TR/css-text-decor-3/">CSS Text Decoration Level 3</a>
416+
<dt><a href="https://www.w3.org/TR/css-text-decor-3/">CSS Text Decoration Module Level 3</a>
417417
[[CSS-TEXT-DECOR-3]]
418418
<dd>
419419
Extends and supersedes CSS2&sect;16.3,
420420
providing more control over text decoration lines
421421
and adding the ability to specify text emphasis marks
422422
and text shadows.
423423

424-
<dt><a href="https://www.w3.org/TR/css-masking-1/">CSS Masking Level 1</a>
424+
<dt><a href="https://www.w3.org/TR/css-masking-1/">CSS Masking Module Level 1</a>
425425
[[CSS-MASKING-1]]
426426
<dd>
427427
Replaces CSS2&sect;11.1.2

css-align-3/Overview.bs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,11 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
762762

763763
The default [=fallback alignment=] for this value is ''flex-start''.
764764
<span class='note'>(For layout modes other than flex layout, ''flex-start'' is identical to ''start''.)</span>
765+
766+
Note: This `align-content/stretch` definition applies to the [=content-distribution properties=];
767+
the [=self-alignment properties=] 'justify-self'/'align-self' have their own ''justify-self/stretch'' value,
768+
which can grow <em>or shrink</em> the [=alignment subject=]
769+
to ensure it exactly fits the [=alignment container=].
765770
</dl>
766771

767772
These values are represented with the <<content-distribution>> grammar term:

0 commit comments

Comments
 (0)