Skip to content

Prepare for Tailwind 2.0 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 22, 2020
Merged

Prepare for Tailwind 2.0 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41a24c0
mark npm package as public
RobinMalfait Oct 21, 2020
6a6e9f0
bump tailwindcss to 2.0
RobinMalfait Oct 21, 2020
587db8f
rename prepare to prepublishOnly
RobinMalfait Oct 21, 2020
e911196
add prettier config + reformat
RobinMalfait Oct 22, 2020
49ec7a7
update typography with new defaults
RobinMalfait Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@
"main": "src/index.js",
"repository": "https://github.com/tailwindcss/typography",
"license": "MIT",
"publishConfig": {
"access": "public"
},
"prettier": {
"printWidth": 100,
"semi": false,
"singleQuote": true,
"trailingComma": "es5"
},
"scripts": {
"dev": "next dev demo",
"build": "next build demo",
"export": "next export demo",
"deploy": "npm run build && npm run export",
"start": "next start demo",
"prepare": "node scripts/build.js"
"prepublishOnly": "node scripts/build.js"
},
"peerDependencies": {
"tailwindcss": "^1.5.0"
Expand All @@ -29,6 +38,6 @@
"postcss": "^7.0.17",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"tailwindcss": "^1.5"
"tailwindcss": "^2.0.0-alpha.1"
}
}
5 changes: 4 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ module.exports = plugin.withOptions(
addComponents(
[
{
[`.${className}`]: merge(...castArray(styles.default.css), configToCss(config.default || {})),
[`.${className}`]: merge(
...castArray(styles.default.css),
configToCss(config.default || {})
),
},
...modifiers.map((modifier) => ({
[`.${className}-${modifier}`]: merge(
Expand Down
18 changes: 9 additions & 9 deletions src/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {
color: defaultTheme.colors.gray[700],
maxWidth: '65ch',
'[class~="lead"]': {
color: defaultTheme.colors.gray[700],
color: defaultTheme.colors.gray[600],
},
a: {
color: defaultTheme.colors.gray[900],
Expand All @@ -36,27 +36,27 @@ module.exports = {
content: 'counter(list-counter) "."',
position: 'absolute',
fontWeight: '400',
color: defaultTheme.colors.gray[600],
color: defaultTheme.colors.gray[500],
},
'ul > li': {
position: 'relative',
},
'ul > li::before': {
content: '""',
position: 'absolute',
backgroundColor: defaultTheme.colors.gray[400],
backgroundColor: defaultTheme.colors.gray[300],
borderRadius: '50%',
},
hr: {
borderColor: defaultTheme.colors.gray[300],
borderColor: defaultTheme.colors.gray[200],
borderTopWidth: 1,
},
blockquote: {
fontWeight: '500',
fontStyle: 'italic',
color: defaultTheme.colors.gray[900],
borderLeftWidth: '0.25rem',
borderLeftColor: defaultTheme.colors.gray[300],
borderLeftColor: defaultTheme.colors.gray[200],
quotes: '"\\201C""\\201D""\\2018""\\2019"',
},
'blockquote p:first-of-type::before': {
Expand All @@ -82,7 +82,7 @@ module.exports = {
fontWeight: '600',
},
'figure figcaption': {
color: defaultTheme.colors.gray[600],
color: defaultTheme.colors.gray[500],
},
code: {
color: defaultTheme.colors.gray[900],
Expand All @@ -95,7 +95,7 @@ module.exports = {
content: '"`"',
},
pre: {
color: defaultTheme.colors.gray[300],
color: defaultTheme.colors.gray[200],
backgroundColor: defaultTheme.colors.gray[800],
overflowX: 'auto',
},
Expand Down Expand Up @@ -127,14 +127,14 @@ module.exports = {
color: defaultTheme.colors.gray[900],
fontWeight: '600',
borderBottomWidth: '1px',
borderBottomColor: defaultTheme.colors.gray[400],
borderBottomColor: defaultTheme.colors.gray[300],
},
'thead th': {
verticalAlign: 'bottom',
},
'tbody tr': {
borderBottomWidth: '1px',
borderBottomColor: defaultTheme.colors.gray[300],
borderBottomColor: defaultTheme.colors.gray[200],
},
'tbody tr:last-child': {
borderBottomWidth: '0',
Expand Down
Loading