tailwindcss 0.0.0-oxide-insiders.16a002c → 0.0.0-oxide-insiders.8bd2846
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/corePlugins.js +4 -1
- package/lib/css/preflight.css +2 -0
- package/package.json +2 -2
- package/src/corePlugins.js +4 -1
- package/src/css/preflight.css +2 -0
- package/types/config.d.ts +7 -1
package/lib/corePlugins.js
CHANGED
|
@@ -3046,11 +3046,14 @@ let corePlugins = {
|
|
|
3046
3046
|
let [families, options = {}] = Array.isArray(value) && (0, _isPlainObject.default)(value[1]) ? value : [
|
|
3047
3047
|
value
|
|
3048
3048
|
];
|
|
3049
|
-
let { fontFeatureSettings } = options;
|
|
3049
|
+
let { fontFeatureSettings , fontVariationSettings } = options;
|
|
3050
3050
|
return {
|
|
3051
3051
|
"font-family": Array.isArray(families) ? families.join(", ") : families,
|
|
3052
3052
|
...fontFeatureSettings === undefined ? {} : {
|
|
3053
3053
|
"font-feature-settings": fontFeatureSettings
|
|
3054
|
+
},
|
|
3055
|
+
...fontVariationSettings === undefined ? {} : {
|
|
3056
|
+
"font-variation-settings": fontVariationSettings
|
|
3054
3057
|
}
|
|
3055
3058
|
};
|
|
3056
3059
|
}
|
package/lib/css/preflight.css
CHANGED
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
3. Use a more readable tab size.
|
|
24
24
|
4. Use the user's configured `sans` font-family by default.
|
|
25
25
|
5. Use the user's configured `sans` font-feature-settings by default.
|
|
26
|
+
6. Use the user's configured `sans` font-variation-settings by default.
|
|
26
27
|
*/
|
|
27
28
|
|
|
28
29
|
html {
|
|
@@ -32,6 +33,7 @@ html {
|
|
|
32
33
|
tab-size: 4; /* 3 */
|
|
33
34
|
font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
|
|
34
35
|
font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
|
|
36
|
+
font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
/*
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tailwindcss",
|
|
3
|
-
"version": "0.0.0-oxide-insiders.
|
|
3
|
+
"version": "0.0.0-oxide-insiders.8bd2846",
|
|
4
4
|
"description": "A utility-first CSS framework for rapidly building custom user interfaces.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
"postcss": "^8.0.9"
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
-
"@tailwindcss/oxide": "0.0.0-oxide-insiders.
|
|
73
|
+
"@tailwindcss/oxide": "0.0.0-oxide-insiders.8bd2846",
|
|
74
74
|
"arg": "^5.0.2",
|
|
75
75
|
"browserslist": "^4.21.5",
|
|
76
76
|
"chokidar": "^3.5.3",
|
package/src/corePlugins.js
CHANGED
|
@@ -1915,13 +1915,16 @@ export let corePlugins = {
|
|
|
1915
1915
|
font: (value) => {
|
|
1916
1916
|
let [families, options = {}] =
|
|
1917
1917
|
Array.isArray(value) && isPlainObject(value[1]) ? value : [value]
|
|
1918
|
-
let { fontFeatureSettings } = options
|
|
1918
|
+
let { fontFeatureSettings, fontVariationSettings } = options
|
|
1919
1919
|
|
|
1920
1920
|
return {
|
|
1921
1921
|
'font-family': Array.isArray(families) ? families.join(', ') : families,
|
|
1922
1922
|
...(fontFeatureSettings === undefined
|
|
1923
1923
|
? {}
|
|
1924
1924
|
: { 'font-feature-settings': fontFeatureSettings }),
|
|
1925
|
+
...(fontVariationSettings === undefined
|
|
1926
|
+
? {}
|
|
1927
|
+
: { 'font-variation-settings': fontVariationSettings }),
|
|
1925
1928
|
}
|
|
1926
1929
|
},
|
|
1927
1930
|
},
|
package/src/css/preflight.css
CHANGED
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
3. Use a more readable tab size.
|
|
24
24
|
4. Use the user's configured `sans` font-family by default.
|
|
25
25
|
5. Use the user's configured `sans` font-feature-settings by default.
|
|
26
|
+
6. Use the user's configured `sans` font-variation-settings by default.
|
|
26
27
|
*/
|
|
27
28
|
|
|
28
29
|
html {
|
|
@@ -32,6 +33,7 @@ html {
|
|
|
32
33
|
tab-size: 4; /* 3 */
|
|
33
34
|
font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
|
|
34
35
|
font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
|
|
36
|
+
font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
/*
|
package/types/config.d.ts
CHANGED
|
@@ -168,7 +168,13 @@ interface ThemeConfig {
|
|
|
168
168
|
string,
|
|
169
169
|
| string
|
|
170
170
|
| string[]
|
|
171
|
-
| [
|
|
171
|
+
| [
|
|
172
|
+
fontFamily: string | string[],
|
|
173
|
+
configuration: Partial<{
|
|
174
|
+
fontFeatureSettings: string
|
|
175
|
+
fontVariationSettings: string
|
|
176
|
+
}>
|
|
177
|
+
]
|
|
172
178
|
>
|
|
173
179
|
>
|
|
174
180
|
fontSize: ResolvableTo<
|