Skip to content

Commit c321dbb

Browse files
committed
Fixed Tailwind 2 fontSize default theme format incompatibility
1 parent 44096f9 commit c321dbb

File tree

7 files changed

+5
-138
lines changed

7 files changed

+5
-138
lines changed

demo/index.html

Lines changed: 0 additions & 30 deletions
This file was deleted.

demo/scripts.js

Lines changed: 0 additions & 74 deletions
This file was deleted.

demo/styles.pcss

Lines changed: 0 additions & 3 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
"inter.json"
1111
],
1212
"scripts": {
13-
"dev": "parcel serve demo/index.html",
1413
"update": "node ./update.js",
15-
"build": "parcel build demo/index.html",
16-
"test": "echo Success"
14+
"test": "echo \"Error: no test specified\" && exit 1"
1715
},
1816
"repository": {
1917
"type": "git",
@@ -37,11 +35,8 @@
3735
"tailwindcss": "^1.9.0 || ^2.0.0"
3836
},
3937
"devDependencies": {
40-
"autoprefixer": "^9.8.0",
4138
"fontkit": "^1.8.1",
42-
"node-fetch": "^2.6.1",
43-
"parcel-bundler": "^1.12.4",
44-
"tailwindcss": "^1.9.6"
39+
"node-fetch": "^2.6.1"
4540
},
4641
"dependencies": {
4742
"parse-unit": "^1.0.1"

postcss.config.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,12 @@ module.exports = function (options = {}) {
8585
};
8686

8787
const fontSizeStyles = (fontSize, { a, b, c }) => {
88-
const sizeInPx = toPx(fontSize, defaultConfig.baseFontSize);
88+
const size = isArrayLike(fontSize) ? fontSize[0] : fontSize;
89+
const sizeInPx = toPx(size, defaultConfig.baseFontSize);
8990
const trackingSize = tracking(sizeInPx, a, b, c);
9091

9192
return {
92-
fontSize,
93+
fontSize: size,
9394
letterSpacing: `${round(trackingSize, 7)}em`
9495
};
9596
};

tailwind.config.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)