generated from timelessco/react-components-template
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(deps): ⬆️ update dependency tailwind-merge to ^0.8.0 (#186)
* fix(deps): ⬆️ update dependency tailwind-merge to ^0.8.0 * fix(twMerge): 🐛 major change issue Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Navin Moorthy <navin007.a@gmail.com>
- Loading branch information
1 parent
f2b09f7
commit 3e033ec
Showing
3 changed files
with
14 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,13 @@ | ||
import { createTailwindMerge } from "tailwind-merge"; | ||
import { extendTailwindMerge } from "tailwind-merge"; | ||
|
||
export { cx } from "@renderlesskit/react"; | ||
|
||
export const tcm = createTailwindMerge(getDefaultConfig => { | ||
const defaultConfig = getDefaultConfig(); | ||
|
||
return { | ||
...defaultConfig, | ||
classGroups: { | ||
...defaultConfig.classGroups, | ||
"font-size": [ | ||
...defaultConfig.classGroups["font-size"], | ||
// Defined custom text presets | ||
{ | ||
text: ["cxs", "paragraph-cxs", "paragraph-sm", "2base"], | ||
}, | ||
], | ||
}, | ||
}; | ||
export const tcm = extendTailwindMerge({ | ||
classGroups: { | ||
"font-size": [ | ||
{ | ||
text: ["cxs", "paragraph-cxs", "paragraph-sm", "2base"], | ||
}, | ||
], | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3e033ec
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs: