🐛 fix(AccordionComponent): resolve merge conflict in AccordionComponent/index.tsx
🐛 fix(AccordionComponent): add missing className to AccordionContent in AccordionComponent/index.tsx 🔧 chore(tailwind.config.js): fix syntax error in tailwind.config.js
This commit is contained in:
commit
c602fe5347
2 changed files with 9 additions and 2 deletions
|
|
@ -34,6 +34,7 @@ export default function AccordionComponent({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<<<<<<< HEAD
|
||||||
<Accordion
|
<Accordion
|
||||||
type="single"
|
type="single"
|
||||||
className="w-full"
|
className="w-full"
|
||||||
|
|
@ -41,6 +42,10 @@ export default function AccordionComponent({
|
||||||
onValueChange={setValue}
|
onValueChange={setValue}
|
||||||
>
|
>
|
||||||
<AccordionItem value={keyValue} className="border-b">
|
<AccordionItem value={keyValue} className="border-b">
|
||||||
|
=======
|
||||||
|
<Accordion type="single" value={value} onValueChange={setValue}>
|
||||||
|
<AccordionItem value={trigger} className="border-none">
|
||||||
|
>>>>>>> bugfix-accordion
|
||||||
<AccordionTrigger
|
<AccordionTrigger
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
handleClick();
|
handleClick();
|
||||||
|
|
@ -49,7 +54,9 @@ export default function AccordionComponent({
|
||||||
>
|
>
|
||||||
{trigger}
|
{trigger}
|
||||||
</AccordionTrigger>
|
</AccordionTrigger>
|
||||||
<AccordionContent>{children}</AccordionContent>
|
<AccordionContent className="AccordionContent">
|
||||||
|
{children}
|
||||||
|
</AccordionContent>
|
||||||
</AccordionItem>
|
</AccordionItem>
|
||||||
</Accordion>
|
</Accordion>
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ module.exports = {
|
||||||
},
|
},
|
||||||
fontFamily: {
|
fontFamily: {
|
||||||
sans: ["var(--font-sans)", ...fontFamily.sans],
|
sans: ["var(--font-sans)", ...fontFamily.sans],
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue