Skip to content

Commit e32f0cc

Browse files
committed
Merge branch 'main' of github.com:w3c/csswg-drafts into main
2 parents ba64b3f + 5d284d0 commit e32f0cc

7 files changed

Lines changed: 228 additions & 80 deletions

File tree

css-cascade-3/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Processing Stylesheet Imports</h3>
181181
it is perfectly appropriate for a UA to fetch a style sheet only once,
182182
even though it's linked or imported multiple times.
183183

184-
The <a>origin</a> of an imported style sheet is the <a>origin</a> of the style sheet that imported it.
184+
The URL [=url/origin=] of an imported style sheet is the URL [=url/origin=] of the style sheet that imported it.
185185

186186
The <a>environment encoding</a> of an imported style sheet is the encoding of the style sheet that imported it. [[css-syntax-3]]
187187

css-cascade-4/Overview.bs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ED: https://drafts.csswg.org/css-cascade/
99
TR: https://www.w3.org/TR/css-cascade-4/
1010
Editor: Elika J. Etemad / fantasai, Invited Expert, http://fantasai.inkedblade.net/contact, w3cid 35400
1111
Editor: Tab Atkins Jr., Google, http://xanthir.com/contact/, w3cid 42199
12+
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-4-20211015/
13+
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-4-20210319/
1214
Previous Version: https://www.w3.org/TR/2020/WD-css-cascade-4-20200818/
1315
Previous Version: https://www.w3.org/TR/2018/CR-css-cascade-4-20180828/
1416
Previous Version: https://www.w3.org/TR/2016/CR-css-cascade-4-20160114/
@@ -258,7 +260,7 @@ Processing Stylesheet Imports</h3>
258260
it is perfectly appropriate for a UA to fetch a style sheet only once,
259261
even though it's linked or imported multiple times.
260262

261-
The <a>origin</a> of an imported style sheet is the <a>origin</a> of the style sheet that imported it.
263+
The URL [=url/origin=] of an imported style sheet is the URL [=url/origin=] of the style sheet that imported it.
262264

263265
The <a>environment encoding</a> of an imported style sheet is the encoding of the style sheet that imported it. [[css-syntax-3]]
264266

css-cascade-5/Overview.bs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Work Status: Refining
77
Group: csswg
88
ED: https://drafts.csswg.org/css-cascade/
99
TR: https://www.w3.org/TR/css-cascade-5/
10-
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-5-20210827/
10+
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-5-20211015/
11+
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-5-20210829/
1112
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-5-20210608/
1213
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-5-20210319/
1314
Previous Version: https://www.w3.org/TR/2021/WD-css-cascade-5-20210119/
@@ -256,7 +257,7 @@ Processing Stylesheet Imports</h3>
256257
it is perfectly appropriate for a UA to fetch a style sheet only once,
257258
even though it's linked or imported multiple times.
258259

259-
The <a>origin</a> of an imported style sheet is the <a>origin</a> of the style sheet that imported it.
260+
The URL [=url/origin=] of an imported style sheet is the URL [=url/origin=] of the style sheet that imported it.
260261

261262
The <a>environment encoding</a> of an imported style sheet is the encoding of the style sheet that imported it. [[css-syntax-3]]
262263

@@ -1002,7 +1003,7 @@ Cascade Sorting Order</h3>
10021003
where style attributes simply have higher specificity than any other author rules. [[CSS2]]
10031004
-->
10041005

1005-
<dt id='style-attr'>The Style Attribute
1006+
<dt id='style-attr'>Element Attached Styles
10061007
<dd>
10071008
Separately for [=normal=] and [=important=] declarations,
10081009
declarations that are attached directly to an element
@@ -1011,6 +1012,8 @@ Cascade Sorting Order</h3>
10111012
take precedence over declarations the same [=importance=]
10121013
that are mapped via style rule.
10131014

1015+
See [[css-style-attr]].
1016+
10141017
<dt id='cascade-layering'>Layers
10151018
<dd>
10161019
Declarations within each [=origin=] and [=context=]

css-color-3/Overview.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ <h3 id=transparency><span class=secno>3.2. </span>Transparency: the ‘<a
560560
<tr>
561561
<th>Name:</th>
562562

563-
<td><dfn id=opacity>opacity</dfn></td>
563+
<td><dfn>opacity</dfn></td>
564564
</tr>
565565

566566
<tr>
@@ -612,7 +612,7 @@ <h3 id=transparency><span class=secno>3.2. </span>Transparency: the ‘<a
612612
<tr>
613613
<th>Name:</th>
614614

615-
<td><dfn id=opacity1>opacity</dfn></td>
615+
<td><dfn id=opacity>opacity</dfn></td>
616616
</tr>
617617

618618
<tr>

css-color-4/Overview.bs

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5376,6 +5376,61 @@ Appendix A: Deprecated CSS System Colors</h2>
53765376
<dd>Text in windows. Same as ''CanvasText''.
53775377
</dl>
53785378

5379+
<h4 id='quirky-color'>
5380+
Appendix B: Deprecated Quirky Hex Colors</h4>
5381+
5382+
When CSS is being parsed in [=quirks mode=],
5383+
<dfn type><<quirky-color>></dfn> is a type of <<color>>
5384+
that is only valid in certain properties:
5385+
5386+
* 'background-color'
5387+
* 'border-color'
5388+
* 'border-top-color'
5389+
* 'border-right-color'
5390+
* 'border-bottom-color'
5391+
* 'border-left-color'
5392+
* 'color'
5393+
5394+
It is <em>not</em> valid in properties that include or reference these properties,
5395+
such as the 'background' shorthand,
5396+
or inside [=functional notations=] such as ''color-mix()''
5397+
5398+
Additionally, while <<quirky-color>> must be valid as a <<color>>
5399+
when parsing the affected properties in the ''@supports'' rule,
5400+
it is <em>not</em> valid for those properties
5401+
when used in the {{CSS.supports()}} method.
5402+
5403+
A <<quirky-color>> can be represented
5404+
as a <<number-token>>, <<dimension-token>>, or <<ident-token>>,
5405+
according to the following rules:
5406+
5407+
* If it's an <<ident-token>>,
5408+
the token's representation must contain exactly 3 or 6 characters,
5409+
all hexadecimal digits.
5410+
It represents a <<hex-color>> with the same value.
5411+
5412+
* If it's a <<number-token>>,
5413+
it must have its integer flag set.
5414+
5415+
Serialize the integer's value.
5416+
If the serialization has less than 6 characters,
5417+
prepend "0" characters to it until it is 6 characters long.
5418+
It represents a <<hex-color>> with the same value.
5419+
5420+
* If it's a <<dimension-token>>,
5421+
it must have its integer flag set.
5422+
5423+
Serialize the integer's value,
5424+
and append the representation of the token's unit.
5425+
If the result has less than 6 characters,
5426+
prepend "0" characters to it until it is 6 characters long.
5427+
It represents a <<hex-color>> with the same value.
5428+
5429+
(In other words, Quirks Mode allows hex colors to be written without the leading "#",
5430+
but with weird parsing rules.)
5431+
5432+
5433+
53795434

53805435
<h2 id="acknowledgments" class="no-num no-ref">
53815436
Acknowledgments</h2>

css-values-3/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ Font-relative Lengths: the ''em'', ''ex'', ''ch'', ''rem'' units</h4>
10561056

10571057
The <dfn export id="font-relative-length">font-relative lengths</dfn>
10581058
refer to the font metrics of the element on which they are used--
1059-
or, in the case of ''rem'', the metrics of the root element).
1059+
or, in the case of ''rem'', the metrics of the root element.
10601060

10611061
<dl export dfn-type=value dfn-for="<length>">
10621062
<dt><dfn id="em" lt="em">em unit</dfn>

0 commit comments

Comments
 (0)