Skip to content
This repository was archived by the owner on Apr 6, 2021. It is now read-only.

Commit 5537c70

Browse files
committed
Fix font variant numeric plugin
1 parent 219337a commit 5537c70

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

src/corePlugins/fontVariantNumeric.js

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
let fontVariantBaseStyles = [
2-
'.ordinal, .slashed-zero, .lining-nums, .oldstyle-nums, .proportional-nums, .tabular-nums, .diagonal-fractions, .stacked-fractions',
3-
{
1+
let fontVariantBaseStyles = {
2+
'.ordinal, .slashed-zero, .lining-nums, .oldstyle-nums, .proportional-nums, .tabular-nums, .diagonal-fractions, .stacked-fractions': {
43
'--tw-ordinal': 'var(--tw-empty,/*!*/ /*!*/)',
54
'--tw-slashed-zero': 'var(--tw-empty,/*!*/ /*!*/)',
65
'--tw-numeric-figure': 'var(--tw-empty,/*!*/ /*!*/)',
@@ -9,32 +8,32 @@ let fontVariantBaseStyles = [
98
'font-variant-numeric':
109
'var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure) var(--tw-numeric-spacing) var(--tw-numeric-fraction)',
1110
},
12-
]
11+
}
1312

1413
module.exports = function ({ jit: { addUtilities } }) {
1514
addUtilities({
16-
'normal-nums': [fontVariantBaseStyles],
17-
ordinal: [fontVariantBaseStyles],
18-
'slashed-zero': [fontVariantBaseStyles],
19-
'lining-nums': [fontVariantBaseStyles],
20-
'oldstyle-nums': [fontVariantBaseStyles],
21-
'proportional-nums': [fontVariantBaseStyles],
22-
'tabular-nums': [fontVariantBaseStyles],
23-
'diagonal-fractions': [fontVariantBaseStyles],
24-
'stacked-fractions': [fontVariantBaseStyles],
15+
'normal-nums': fontVariantBaseStyles,
16+
ordinal: fontVariantBaseStyles,
17+
'slashed-zero': fontVariantBaseStyles,
18+
'lining-nums': fontVariantBaseStyles,
19+
'oldstyle-nums': fontVariantBaseStyles,
20+
'proportional-nums': fontVariantBaseStyles,
21+
'tabular-nums': fontVariantBaseStyles,
22+
'diagonal-fractions': fontVariantBaseStyles,
23+
'stacked-fractions': fontVariantBaseStyles,
2524
})
2625

2726
addUtilities({
28-
'normal-nums': [['.normal-nums', { 'font-variant-numeric': 'normal' }]],
29-
ordinal: [['.ordinal', { '--tw-ordinal': 'ordinal' }]],
30-
'slashed-zero': [['.slashed-zero', { '--tw-slashed-zero': 'slashed-zero' }]],
31-
'lining-nums': [['.lining-nums', { '--tw-numeric-figure': 'lining-nums' }]],
32-
'oldstyle-nums': [['.oldstyle-nums', { '--tw-numeric-figure': 'oldstyle-nums' }]],
33-
'proportional-nums': [['.proportional-nums', { '--tw-numeric-spacing': 'proportional-nums' }]],
34-
'tabular-nums': [['.tabular-nums', { '--tw-numeric-spacing': 'tabular-nums' }]],
35-
'diagonal-fractions': [
36-
['.diagonal-fractions', { '--tw-numeric-fraction': 'diagonal-fractions' }],
37-
],
38-
'stacked-fractions': [['.stacked-fractions', { '--tw-numeric-fraction': 'stacked-fractions' }]],
27+
'normal-nums': { '.normal-nums': { 'font-variant-numeric': 'normal' } },
28+
ordinal: { '.ordinal': { '--tw-ordinal': 'ordinal' } },
29+
'slashed-zero': { '.slashed-zero': { '--tw-slashed-zero': 'slashed-zero' } },
30+
'lining-nums': { '.lining-nums': { '--tw-numeric-figure': 'lining-nums' } },
31+
'oldstyle-nums': { '.oldstyle-nums': { '--tw-numeric-figure': 'oldstyle-nums' } },
32+
'proportional-nums': { '.proportional-nums': { '--tw-numeric-spacing': 'proportional-nums' } },
33+
'tabular-nums': { '.tabular-nums': { '--tw-numeric-spacing': 'tabular-nums' } },
34+
'diagonal-fractions': {
35+
'.diagonal-fractions': { '--tw-numeric-fraction': 'diagonal-fractions' },
36+
},
37+
'stacked-fractions': { '.stacked-fractions': { '--tw-numeric-fraction': 'stacked-fractions' } },
3938
})
4039
}

0 commit comments

Comments
 (0)