tailwind_merge 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5402fe57c8b5f28ac07847bc17a04c6b5cd1ba9ad62ce945920759a95aece31
-  data.tar.gz: 0ef6aad523beb48f559b70e6e88662e0db9df8269152d2ccdcb5d08b5f96801b
+  metadata.gz: 631245d88b1aff92448e4322e4a7f6296e5bcaacecede5b713fe797b088dc130
+  data.tar.gz: b124e90880aea18b42eb236564df4062336b5d1fe6a8b674f2fa29954b910642
 SHA512:
-  metadata.gz: 568f47ffb9084553b5efc2b37dadcfdf1da552f698340f94bbbd6695618836213d4906b820370e55418350176d2d47c6f63dea5c5957efd34987b0a5ccb2cd4f
-  data.tar.gz: f4656fe96ddfed6d74308733575503b33a69cecd9ff261cded4e60978e7a9927652afbd09a2ad0b02ea8988c6540730bc63cbec1edb4f782b5e14d04d4cbebe7
+  metadata.gz: 968b476bdc24e2f7058001f7b4b75838b8c5189a039b54fbcde7c25478ce87fbb0afe9aa47d9d230977997cf2589bb8d03fe2560d8dae6a6345c64b7d771ccbc
+  data.tar.gz: 80f3e903482e85bc576841b9d29657778572f54da4381e21bd0e55ea8d46efc0e6f4e5a0f4a5f0e1153c924691dd3b7b4793891fcc9a9d90999a1febefb86709

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [v0.8.0] - 19-09-2023
+## What's Changed
+* Add clarifications to README by @borama in https://github.com/gjtorikian/tailwind_merge/pull/17
+* Bump actions/checkout from 3 to 4 by @dependabot in https://github.com/gjtorikian/tailwind_merge/pull/18
+* Update What's it for example in README by @borama in https://github.com/gjtorikian/tailwind_merge/pull/19
+* Swap to using IMAGE, not URL by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/20
+
+## New Contributors
+* @borama made their first contribution in https://github.com/gjtorikian/tailwind_merge/pull/17
+* @dependabot made their first contribution in https://github.com/gjtorikian/tailwind_merge/pull/18
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.7.4...v0.8.0
 ## [v0.7.4] - 03-07-2023
 null
 ## [v0.7.3] - 26-06-2023

data/lib/tailwind_merge/config.rb

@@ -1647,16 +1647,33 @@ module TailwindMerge
         ##
         "touch" => [
           {
-            "touch" => [
-              "auto",
-              "none",
-              "pinch-zoom",
-              "manipulation",
-              { "pan" => ["x", "left", "right", "y", "up", "down"] },
-            ],
+            "touch" => ["auto", "none", "manipulation"],
+          },
+        ],
+        ##
+        # Touch Action X
+        # @see https://tailwindcss.com/docs/touch-action
+        ##
+        "touch-x" => [
+          {
+            "touch-pan" => ["x", "left", "right"],
           },
         ],
         ##
+        # Touch Action Y
+        # @see https://tailwindcss.com/docs/touch-action
+        ##
+        "touch-y" => [
+          {
+            "touch-pan" => ["y", "up", "down"],
+          },
+        ],
+        ##
+        # Touch Action Pinch Zoom
+        # @see https://tailwindcss.com/docs/touch-action
+        ##
+        "touch-pz" => ["touch-pinch-zoom"],
+        ##
         # User Select
         # @see https://tailwindcss.com/docs/user-select
         ##
@@ -1783,6 +1800,10 @@ module TailwindMerge
         ],
         "scroll-px" => ["scroll-pr", "scroll-pl"],
         "scroll-py" => ["scroll-pt", "scroll-pb"],
+        "touch" => ["touch-x", "touch-y", "touch-pz"],
+        "touch-x" => ["touch"],
+        "touch-y" => ["touch"],
+        "touch-pz" => ["touch"],
       },
       conflicting_class_group_modifiers: {
         "font-size": ["leading"],

data/lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Garen J. Torikian