Skip to content

Commit 46b86fc

Browse files
committed
fix: tailwind conflicts
1 parent c755f0d commit 46b86fc

File tree

1 file changed

+38
-45
lines changed

1 file changed

+38
-45
lines changed

tailwind.config.js

+38-45
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,46 @@ export default {
1212
md: 'calc(var(--radius) - 2px)',
1313
sm: 'calc(var(--radius) - 4px)',
1414
},
15-
colors: {
16-
'main-green': '#2EBB4B',
17-
'light-green': '#79D8AC',
18-
pink: '#F55A99',
19-
black: '#1F1E26',
20-
grey: '#757575',
21-
'light-grey': '#F3F3F3',
15+
extend: {
16+
borderRadius: {
17+
lg: 'var(--radius)',
18+
md: 'calc(var(--radius) - 2px)',
19+
sm: 'calc(var(--radius) - 4px)',
20+
},
21+
colors: {
22+
'primary-green': '#4ade80',
23+
'light-green': '#bbf7d0',
24+
'primary-pink': '#F55A99',
25+
'light-pink': '#D7A2C3',
26+
'ruby-pink': '#AC4270',
27+
'bg-black': '#181818',
28+
'dark-grey': '#7A7A7A',
29+
'light-grey': '#A3A3A3',
30+
'text-grey': '#B5B5B5',
31+
'main-green': '#2EBB4B',
32+
'light-green': '#79D8AC',
33+
pink: '#F55A99',
34+
black: '#1F1E26',
35+
grey: '#757575',
36+
orange: '#FBB300',
37+
'orange-hover': '#fbb400c9',
38+
'light-grey': '#F3F3F3',
39+
soon: '#FFB74D',
40+
'kind-of-soon': '#FEE720',
41+
'not-soon': '#81C784',
42+
inactive: '#B0BEC5',
43+
overdue: '#FF5252',
44+
},
45+
transitionDuration: {
46+
50: '50ms',
47+
25: '25ms',
48+
},
49+
fontFamily: {
50+
montserrat: ['montserrat', 'sans-serif'],
51+
},
2252
},
23-
extend: {
24-
borderRadius: {
25-
lg: 'var(--radius)',
26-
md: 'calc(var(--radius) - 2px)',
27-
sm: 'calc(var(--radius) - 4px)',
28-
},
29-
colors: {
30-
'primary-green': '#4ade80',
31-
'light-green': '#bbf7d0',
32-
'primary-pink': '#F55A99',
33-
'light-pink': '#D7A2C3',
34-
'ruby-pink': '#AC4270',
35-
'bg-black': '#181818',
36-
'dark-grey': '#7A7A7A',
37-
'light-grey': '#A3A3A3',
38-
'text-grey': '#B5B5B5',
39-
},
40-
transitionDuration: {
41-
50: '50ms',
42-
25: '25ms',
43-
44-
'main-green': '#2EBB4B',
45-
'light-green': '#79D8AC',
46-
pink: '#F55A99',
47-
black: '#1F1E26',
48-
grey: '#757575',
49-
orange: '#FBB300',
50-
'orange-hover': '#fbb400c9',
51-
'light-grey': '#F3F3F3',
52-
soon: '#FFB74D',
53-
'kind-of-soon': '#FEE720',
54-
'not-soon': '#81C784',
55-
inactive: '#B0BEC5',
56-
overdue: '#FF5252',
57-
},
58-
fontFamily: {
59-
montserrat: ['montserrat', 'sans-serif'],
53+
plugins: [require('tailwindcss-animate')],
6054
},
6155
},
62-
plugins: [require('tailwindcss-animate')],
6356
},
6457
};

0 commit comments

Comments
 (0)