🐛 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 (
|
||||
<>
|
||||
<<<<<<< HEAD
|
||||
<Accordion
|
||||
type="single"
|
||||
className="w-full"
|
||||
|
|
@ -41,6 +42,10 @@ export default function AccordionComponent({
|
|||
onValueChange={setValue}
|
||||
>
|
||||
<AccordionItem value={keyValue} className="border-b">
|
||||
=======
|
||||
<Accordion type="single" value={value} onValueChange={setValue}>
|
||||
<AccordionItem value={trigger} className="border-none">
|
||||
>>>>>>> bugfix-accordion
|
||||
<AccordionTrigger
|
||||
onClick={() => {
|
||||
handleClick();
|
||||
|
|
@ -49,7 +54,9 @@ export default function AccordionComponent({
|
|||
>
|
||||
{trigger}
|
||||
</AccordionTrigger>
|
||||
<AccordionContent>{children}</AccordionContent>
|
||||
<AccordionContent className="AccordionContent">
|
||||
{children}
|
||||
</AccordionContent>
|
||||
</AccordionItem>
|
||||
</Accordion>
|
||||
</>
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ module.exports = {
|
|||
},
|
||||
fontFamily: {
|
||||
sans: ["var(--font-sans)", ...fontFamily.sans],
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue