Skip to content

Commit 452a8e7

Browse files
author
litherum
committed
[css-fonts] Update which properties are reset by the 'font' shorthand
w3c#1636
1 parent 15de56b commit 452a8e7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

css-fonts-4/Overview.bs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,8 +953,8 @@ The syntax of this property is based on a traditional typographical
953953
shorthand notation to set multiple properties related to fonts.
954954

955955
All subproperties of the 'font' property are first reset to their initial values,
956-
including those listed above plus 'font-size-adjust', 'font-kerning', subproperties of 'font-variant' and
957-
and 'font-language-override'.
956+
including those listed above plus 'font-size-adjust', 'font-kerning', all subproperties of 'font-variant', 'font-feature-settings',
957+
'font-language-override', 'font-min-size', 'font-max-size', 'font-optical-sizing', 'font-variation-settings', and 'font-palette'.
958958
Then, those properties that are given explicit values in the 'font'
959959
shorthand are set to those values. For a definition of allowed and
960960
initial values, see the previously defined properties. For reasons of

css-fonts/Fonts.src.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,8 @@ <h3 id="font-prop">Shorthand font property: the <a href="#propdef-font">font</a>
12671267
<p>All subproperties of the 'font' property are first reset to their initial values,
12681268
including those listed above plus
12691269
<span class="property">'font-size-adjust'</span>,
1270-
<span class="property">'font-kerning'</span>, subproperties of <span title="font-variant!!property">'font-variant'</span> and
1270+
<span class="property">'font-kerning'</span>, all subproperties of <span title="font-variant!!property">'font-variant'</span>,
1271+
<span class="property">'font-feature-settings'</span>,
12711272
and <span>'font-language-override'</span>.
12721273
Then, those properties that are given explicit values in the <span class="property">'font'</span>
12731274
shorthand are set to those values. For a definition of allowed and

0 commit comments

Comments
 (0)