Skip to content

Commit cd0bf9e

Browse files
maiieulmaiieul
authored
Merge pull request #787 from maiieul/update-tailwind-configs
Update-tailwind-configs
2 parents 40c170c + 01d12f3 commit cd0bf9e

File tree

5 files changed

+84
-9
lines changed

5 files changed

+84
-9
lines changed

‎apps/component-tests/tailwind.config.cjs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ module.exports = {
2323
],
2424
darkMode: 'class',
2525
theme: {
26-
important: true,
2726
extend: {
2827
screens: {
2928
xs: '480px',
@@ -97,11 +96,21 @@ module.exports = {
9796
1: 'calc(var(--stroke-width) + 1px)',
9897
2: 'calc(var(--stroke-width) + 2px)',
9998
},
100-
// EXTEND-END
10199
animation: {
102-
'accordion-down': '0.2s ease-out 0s 1 normal forwards accordion-open',
103-
'accordion-up': '0.2s ease-out 0s 1 normal forwards accordion-close',
100+
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
101+
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
104102
},
103+
keyframes: {
104+
'collapsible-down': {
105+
from: { height: '0' },
106+
to: { height: 'var(--qwikui-collapsible-content-height)' },
107+
},
108+
'collapsible-up': {
109+
from: { height: 'var(--qwikui-collapsible-content-height)' },
110+
to: { height: '0' },
111+
},
112+
},
113+
// EXTEND-END
105114
transitionTimingFunction: {
106115
step: 'cubic-bezier(0.6, 0.6, 0, 1)',
107116
jumpy: 'cubic-bezier(0.87, 0, 0.13, 1)',

‎apps/website/src/routes/docs/styled/(getting-started)/install/index.mdx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ const { join } = require('path');
122122
const plugin = require('tailwindcss/plugin');
123123

124124
/** @type {import('tailwindcss').Config} */
125+
125126
module.exports = {
126127
content: [join(__dirname, 'src/**/*.{js,ts,jsx,tsx,mdx}')],
127128
plugins: [
@@ -205,6 +206,20 @@ module.exports = {
205206
1: 'calc(var(--stroke-width) + 1px)',
206207
2: 'calc(var(--stroke-width) + 2px)',
207208
},
209+
animation: {
210+
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
211+
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
212+
},
213+
keyframes: {
214+
'collapsible-down': {
215+
from: { height: '0' },
216+
to: { height: 'var(--qwikui-collapsible-content-height)' },
217+
},
218+
'collapsible-up': {
219+
from: { height: 'var(--qwikui-collapsible-content-height)' },
220+
to: { height: '0' },
221+
},
222+
},
208223
},
209224
},
210225
};

‎apps/website/tailwind.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ module.exports = {
9696
1: 'calc(var(--stroke-width) + 1px)',
9797
2: 'calc(var(--stroke-width) + 2px)',
9898
},
99-
// EXTEND-END
10099
animation: {
101100
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
102101
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
@@ -111,6 +110,7 @@ module.exports = {
111110
to: { height: '0' },
112111
},
113112
},
113+
// EXTEND-END
114114
transitionTimingFunction: {
115115
step: 'cubic-bezier(0.6, 0.6, 0, 1)',
116116
jumpy: 'cubic-bezier(0.87, 0, 0.13, 1)',

‎packages/cli/src/generators/setup-tailwind/setup-tailwind-generator.spec.ts

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,20 @@ html {
182182
1: 'calc(var(--stroke-width) + 1px)',
183183
2: 'calc(var(--stroke-width) + 2px)',
184184
},
185+
animation: {
186+
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
187+
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
188+
},
189+
keyframes: {
190+
'collapsible-down': {
191+
from: { height: '0' },
192+
to: { height: 'var(--qwikui-collapsible-content-height)' },
193+
},
194+
'collapsible-up': {
195+
from: { height: 'var(--qwikui-collapsible-content-height)' },
196+
to: { height: '0' },
197+
},
198+
},
185199
fontFamily: {
186200
sans: ['Inter Variable', 'sans-serif'],
187201
},
@@ -301,6 +315,20 @@ html {
301315
1: 'calc(var(--stroke-width) + 1px)',
302316
2: 'calc(var(--stroke-width) + 2px)',
303317
},
318+
animation: {
319+
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
320+
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
321+
},
322+
keyframes: {
323+
'collapsible-down': {
324+
from: { height: '0' },
325+
to: { height: 'var(--qwikui-collapsible-content-height)' },
326+
},
327+
'collapsible-up': {
328+
from: { height: 'var(--qwikui-collapsible-content-height)' },
329+
to: { height: '0' },
330+
},
331+
},
304332
fontFamily: {
305333
sans: ['Inter Variable', 'sans-serif'],
306334
},
@@ -419,6 +447,20 @@ html {
419447
1: 'calc(var(--stroke-width) + 1px)',
420448
2: 'calc(var(--stroke-width) + 2px)',
421449
},
450+
animation: {
451+
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
452+
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
453+
},
454+
keyframes: {
455+
'collapsible-down': {
456+
from: { height: '0' },
457+
to: { height: 'var(--qwikui-collapsible-content-height)' },
458+
},
459+
'collapsible-up': {
460+
from: { height: 'var(--qwikui-collapsible-content-height)' },
461+
to: { height: '0' },
462+
},
463+
},
422464
fontFamily: {
423465
sans: ['Inter Variable', 'sans-serif'],
424466
},

‎packages/kit-styled/src/templates/tailwind.config.cjs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ module.exports = {
2323
],
2424
darkMode: 'class',
2525
theme: {
26-
important: true,
2726
extend: {
2827
screens: {
2928
xs: '480px',
@@ -97,11 +96,21 @@ module.exports = {
9796
1: 'calc(var(--stroke-width) + 1px)',
9897
2: 'calc(var(--stroke-width) + 2px)',
9998
},
100-
// EXTEND-END
10199
animation: {
102-
'accordion-down': '0.2s ease-out 0s 1 normal forwards accordion-open',
103-
'accordion-up': '0.2s ease-out 0s 1 normal forwards accordion-close',
100+
'accordion-up': 'collapsible-up 0.2s ease-out 0s 1 normal forwards',
101+
'accordion-down': 'collapsible-down 0.2s ease-out 0s 1 normal forwards',
104102
},
103+
keyframes: {
104+
'collapsible-down': {
105+
from: { height: '0' },
106+
to: { height: 'var(--qwikui-collapsible-content-height)' },
107+
},
108+
'collapsible-up': {
109+
from: { height: 'var(--qwikui-collapsible-content-height)' },
110+
to: { height: '0' },
111+
},
112+
},
113+
// EXTEND-END
105114
transitionTimingFunction: {
106115
step: 'cubic-bezier(0.6, 0.6, 0, 1)',
107116
jumpy: 'cubic-bezier(0.87, 0, 0.13, 1)',

0 commit comments

Comments
 (0)