tailwind-merge 1.13.0 → 1.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -11
- package/dist/lib/default-config.d.ts +1 -1
- package/dist/lib/default-config.mjs +1 -1
- package/dist/lib/default-config.mjs.map +1 -1
- package/dist/tailwind-merge.cjs.development.js +1 -1
- package/dist/tailwind-merge.cjs.development.js.map +1 -1
- package/dist/tailwind-merge.cjs.production.min.js +1 -1
- package/dist/tailwind-merge.cjs.production.min.js.map +1 -1
- package/package.json +1 -1
- package/src/lib/default-config.ts +1 -1
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div align="center">
|
|
4
4
|
<br />
|
|
5
5
|
<a href="https://github.com/dcastil/tailwind-merge">
|
|
6
|
-
<img src="https://github.com/dcastil/tailwind-merge/raw/v1.13.
|
|
6
|
+
<img src="https://github.com/dcastil/tailwind-merge/raw/v1.13.1/assets/logo.svg" alt="tailwind-merge" height="150px" />
|
|
7
7
|
</a>
|
|
8
8
|
</div>
|
|
9
9
|
|
|
@@ -25,13 +25,13 @@ twMerge('px-2 py-1 bg-red hover:bg-dark-red', 'p-3 bg-[#B91C1C]')
|
|
|
25
25
|
|
|
26
26
|
## Get started
|
|
27
27
|
|
|
28
|
-
- [What is it for](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
29
|
-
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
30
|
-
- [Features](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
31
|
-
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
32
|
-
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
33
|
-
- [API reference](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
34
|
-
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
35
|
-
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
36
|
-
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
37
|
-
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v1.13.
|
|
28
|
+
- [What is it for](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/what-is-it-for.md)
|
|
29
|
+
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/when-and-how-to-use-it.md)
|
|
30
|
+
- [Features](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/features.md)
|
|
31
|
+
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/configuration.md)
|
|
32
|
+
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/recipes.md)
|
|
33
|
+
- [API reference](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/api-reference.md)
|
|
34
|
+
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/writing-plugins.md)
|
|
35
|
+
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/versioning.md)
|
|
36
|
+
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/contributing.md)
|
|
37
|
+
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v1.13.1/docs/similar-packages.md)
|
|
@@ -248,7 +248,7 @@ export declare function getDefaultConfig(): {
|
|
|
248
248
|
* @see https://tailwindcss.com/docs/flex-basis
|
|
249
249
|
*/
|
|
250
250
|
readonly basis: readonly [{
|
|
251
|
-
readonly basis: readonly [import("./types").ThemeGetter];
|
|
251
|
+
readonly basis: readonly ["auto", import("./types").ThemeGetter];
|
|
252
252
|
}];
|
|
253
253
|
/**
|
|
254
254
|
* Flex Direction
|