mirror of
https://github.com/nextui-org/nextui.git
synced 2025-12-08 19:26:11 +00:00
fix(progress): turn twMerge true to fix custom styling (#2668)
* fix(progress): turn twMerge true to fix custom styling * fix(changelog): move changes to patch * fix: remove stories from changeset * add Issue number in the changeset * chore(changeset): remove extra space * chore(changeset): changeset message --------- Co-authored-by: Guillaume DE LA RUE <guillaume.de-la-rue@consertotech.pro> Co-authored-by: աɨռɢӄաօռɢ <wingkwong.code@gmail.com>
This commit is contained in:
parent
f00ab630bf
commit
6b96ea9c9c
5
.changeset/short-trainers-dance.md
Normal file
5
.changeset/short-trainers-dance.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"@nextui-org/theme": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Fix custom slot styling with twMerge set to true (#2153)
|
||||||
@ -122,3 +122,15 @@ export const Striped = {
|
|||||||
isStriped: true,
|
isStriped: true,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const CustomSlots = {
|
||||||
|
render: Template,
|
||||||
|
|
||||||
|
args: {
|
||||||
|
...defaultProps,
|
||||||
|
classNames: {
|
||||||
|
indicator: "bg-[#14708A] rounded-[4px]",
|
||||||
|
track: "bg-red-500 rounded-[4px]",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|||||||
@ -133,7 +133,7 @@ const progress = tv(
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
twMerge: false,
|
twMerge: true,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user