Skip to content

Commit 2466866

Browse files
committed
Merge branch 'release/0.9.0'
2 parents c8fee98 + f5b26fb commit 2466866

File tree

2 files changed

+69
-65
lines changed

2 files changed

+69
-65
lines changed

index.js

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,56 @@ module.exports = {
44
extend: {
55
typography: ({ theme }) => ({
66
DEFAULT: {
7-
css: {
8-
'h1, h2, h3, h4': {
9-
'font-weight': '600',
7+
css: [
8+
{
9+
'--tw-prose-body': theme('colors.cu-black[800]'),
10+
'--tw-prose-headings': theme('colors.cu-black[700]'),
11+
'--tw-prose-links': theme('colors.cu-red[DEFAULT]'),
12+
'--tw-prose-bold': theme('colors.cu-black[900]'),
13+
'--tw-prose-bullets': theme('colors.cu-black[600]'),
14+
'--tw-prose-quotes': theme('colors.cu-red[100]'),
15+
'--tw-prose-quote-borders': theme('colors.cu-red[DEFAULT]'),
1016
},
11-
a: {
12-
'font-weight': 'semibold',
13-
'text-decoration': 'none',
14-
'&:hover': {
15-
'text-decoration': 'underline',
17+
{
18+
a: {
19+
fontWeight: 600,
20+
textDecoration: 'none',
21+
'&:hover': {
22+
textDecoration: 'underline',
23+
},
24+
},
25+
h1: {
26+
fontWeight: '600',
27+
},
28+
h2: {
29+
fontWeight: '600',
30+
marginBottom: '1rem',
31+
},
32+
h3: {
33+
fontWeight: '600',
34+
marginBottom: '0.75rem',
35+
},
36+
h4: {
37+
fontWeight: '600',
38+
marginBottom: '0.5rem',
39+
},
40+
'h5, h6': {
41+
fontWeight: '600',
42+
},
43+
'ul, ol': {
44+
'margin-left': '2rem',
45+
},
46+
'ul ul, ol ol': {
47+
'margin-left': '0',
48+
},
49+
'ol li li': {
50+
'list-style-type': 'lower-alpha',
51+
},
52+
'ol li li li': {
53+
'list-style-type': 'lower-roman',
1654
},
1755
},
18-
'ol li li': {
19-
'list-style-type': 'lower-alpha',
20-
},
21-
'ol li li li': {
22-
'list-style-type': 'lower-roman',
23-
},
24-
},
25-
},
26-
lg: {
27-
css: {
28-
h1: {
29-
'font-size': '2em',
30-
},
31-
},
32-
},
33-
xl: {
34-
css: {
35-
h2: {
36-
'font-size': '1.75em',
37-
},
38-
h3: {
39-
'font-size': '1.35em',
40-
},
41-
h4: {
42-
'font-size': '1.1em',
43-
},
44-
},
45-
},
46-
dark: {
47-
css: {
48-
'--tw-prose-body': theme('colors.cu-black[800]'),
49-
'--tw-prose-headings': theme('colors.cu-black[700]'),
50-
'--tw-prose-links': theme('colors.cu-red[DEFAULT]'),
51-
'--tw-prose-bold': theme('colors.cu-black[900]'),
52-
'--tw-prose-bullets': theme('colors.cu-black[500]'),
53-
'--tw-prose-quotes': theme('colors.cu-red[100]'),
54-
'--tw-prose-quote-borders': theme('colors.cu-red[DEFAULT]'),
55-
},
56+
],
5657
},
5758
light: {
5859
css: {
@@ -113,6 +114,9 @@ module.exports = {
113114
'lower-alpha': 'lower-alpha',
114115
'lower-roman': 'lower-roman',
115116
},
117+
margin: {
118+
'offset-center': 'calc(-50vw + 50%)',
119+
},
116120
},
117121
},
118122
plugins: [

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"name": "rds-tailwind-theme",
3-
"author": "Web Services",
4-
"version": "0.8.0",
5-
"description": "Tailwind CSS plugin to add the theme globals to RDS Tailwind UI",
6-
"main": "index.js",
7-
"repository": {
8-
"type": "git",
9-
"url": "https://github.com/cuweb/rds-tailwind-theme"
10-
},
11-
"publishConfig": {
12-
"@carletonuniversity:registry": "https://npm.pkg.github.com"
13-
},
14-
"license": "MIT",
15-
"dependencies": {
16-
"@tailwindcss/aspect-ratio": "0.4.2",
17-
"@tailwindcss/container-queries": "0.1.1",
18-
"@tailwindcss/forms": "0.5.7",
19-
"@tailwindcss/typography": "0.5.14"
20-
}
2+
"name": "@carletonuniversity/rds-tailwind-theme",
3+
"author": "Web Services",
4+
"version": "0.9.0",
5+
"description": "Tailwind CSS plugin to add the theme globals to RDS Tailwind UI",
6+
"main": "index.js",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/cuweb/rds-tailwind-theme"
10+
},
11+
"publishConfig": {
12+
"@carletonuniversity:registry": "https://npm.pkg.github.com"
13+
},
14+
"license": "MIT",
15+
"dependencies": {
16+
"@tailwindcss/aspect-ratio": "0.4.2",
17+
"@tailwindcss/container-queries": "0.1.1",
18+
"@tailwindcss/forms": "0.5.7",
19+
"@tailwindcss/typography": "0.5.14"
20+
}
2121
}

0 commit comments

Comments
 (0)