tailwind_merge 0.8.0 → 0.8.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -0
- data/lib/tailwind_merge/config.rb +28 -7
- data/lib/tailwind_merge/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 631245d88b1aff92448e4322e4a7f6296e5bcaacecede5b713fe797b088dc130
|
|
4
|
+
data.tar.gz: b124e90880aea18b42eb236564df4062336b5d1fe6a8b674f2fa29954b910642
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 968b476bdc24e2f7058001f7b4b75838b8c5189a039b54fbcde7c25478ce87fbb0afe9aa47d9d230977997cf2589bb8d03fe2560d8dae6a6345c64b7d771ccbc
|
|
7
|
+
data.tar.gz: 80f3e903482e85bc576841b9d29657778572f54da4381e21bd0e55ea8d46efc0e6f4e5a0f4a5f0e1153c924691dd3b7b4793891fcc9a9d90999a1febefb86709
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [v0.8.0] - 19-09-2023
|
|
2
|
+
## What's Changed
|
|
3
|
+
* Add clarifications to README by @borama in https://github.com/gjtorikian/tailwind_merge/pull/17
|
|
4
|
+
* Bump actions/checkout from 3 to 4 by @dependabot in https://github.com/gjtorikian/tailwind_merge/pull/18
|
|
5
|
+
* Update What's it for example in README by @borama in https://github.com/gjtorikian/tailwind_merge/pull/19
|
|
6
|
+
* Swap to using IMAGE, not URL by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/20
|
|
7
|
+
|
|
8
|
+
## New Contributors
|
|
9
|
+
* @borama made their first contribution in https://github.com/gjtorikian/tailwind_merge/pull/17
|
|
10
|
+
* @dependabot made their first contribution in https://github.com/gjtorikian/tailwind_merge/pull/18
|
|
11
|
+
|
|
12
|
+
**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.7.4...v0.8.0
|
|
1
13
|
## [v0.7.4] - 03-07-2023
|
|
2
14
|
null
|
|
3
15
|
## [v0.7.3] - 26-06-2023
|
|
@@ -1647,16 +1647,33 @@ module TailwindMerge
|
|
|
1647
1647
|
##
|
|
1648
1648
|
"touch" => [
|
|
1649
1649
|
{
|
|
1650
|
-
"touch" => [
|
|
1651
|
-
|
|
1652
|
-
|
|
1653
|
-
|
|
1654
|
-
|
|
1655
|
-
|
|
1656
|
-
|
|
1650
|
+
"touch" => ["auto", "none", "manipulation"],
|
|
1651
|
+
},
|
|
1652
|
+
],
|
|
1653
|
+
##
|
|
1654
|
+
# Touch Action X
|
|
1655
|
+
# @see https://tailwindcss.com/docs/touch-action
|
|
1656
|
+
##
|
|
1657
|
+
"touch-x" => [
|
|
1658
|
+
{
|
|
1659
|
+
"touch-pan" => ["x", "left", "right"],
|
|
1657
1660
|
},
|
|
1658
1661
|
],
|
|
1659
1662
|
##
|
|
1663
|
+
# Touch Action Y
|
|
1664
|
+
# @see https://tailwindcss.com/docs/touch-action
|
|
1665
|
+
##
|
|
1666
|
+
"touch-y" => [
|
|
1667
|
+
{
|
|
1668
|
+
"touch-pan" => ["y", "up", "down"],
|
|
1669
|
+
},
|
|
1670
|
+
],
|
|
1671
|
+
##
|
|
1672
|
+
# Touch Action Pinch Zoom
|
|
1673
|
+
# @see https://tailwindcss.com/docs/touch-action
|
|
1674
|
+
##
|
|
1675
|
+
"touch-pz" => ["touch-pinch-zoom"],
|
|
1676
|
+
##
|
|
1660
1677
|
# User Select
|
|
1661
1678
|
# @see https://tailwindcss.com/docs/user-select
|
|
1662
1679
|
##
|
|
@@ -1783,6 +1800,10 @@ module TailwindMerge
|
|
|
1783
1800
|
],
|
|
1784
1801
|
"scroll-px" => ["scroll-pr", "scroll-pl"],
|
|
1785
1802
|
"scroll-py" => ["scroll-pt", "scroll-pb"],
|
|
1803
|
+
"touch" => ["touch-x", "touch-y", "touch-pz"],
|
|
1804
|
+
"touch-x" => ["touch"],
|
|
1805
|
+
"touch-y" => ["touch"],
|
|
1806
|
+
"touch-pz" => ["touch"],
|
|
1786
1807
|
},
|
|
1787
1808
|
conflicting_class_group_modifiers: {
|
|
1788
1809
|
"font-size": ["leading"],
|