From 95d5a568344ef2b163bd3cce361bc0fa52ff79fe Mon Sep 17 00:00:00 2001 From: Daniel Subiabre Date: Tue, 23 Sep 2025 15:30:44 +0200 Subject: [PATCH] Include tailwind-merge to allow overriding of classnames --- package.json | 1 + pnpm-lock.yaml | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 38d6e47e..9fd49400 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "marked": "^15.0.12", "media-icons": "^1.1.5", "svelte": "^5.33.13", + "tailwind-merge": "^3.3.1", "tailwindcss": "^4.1.8", "typescript": "^5.8.3" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 949d0924..0caa6c5b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ importers: svelte: specifier: ^5.33.13 version: 5.33.13 + tailwind-merge: + specifier: ^3.3.1 + version: 3.3.1 tailwindcss: specifier: ^4.1.8 version: 4.1.8 @@ -3462,8 +3465,8 @@ packages: tailwind-merge@3.0.2: resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==} - tailwind-merge@3.3.0: - resolution: {integrity: sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==} + tailwind-merge@3.3.1: + resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==} tailwind-variants@1.0.0: resolution: {integrity: sha512-2WSbv4ulEEyuBKomOunut65D8UZwxrHoRfYnxGcQNnHqlSCp2+B7Yz2W+yrNDrxRodOXtGD/1oCcKGNBnUqMqA==} @@ -5962,7 +5965,7 @@ snapshots: dependencies: clsx: 2.1.1 svelte: 5.33.13 - tailwind-merge: 3.3.0 + tailwind-merge: 3.3.1 flowbite-svelte@1.5.2(rollup@4.36.0)(svelte@5.33.13)(tailwindcss@4.1.8): dependencies: @@ -5972,7 +5975,7 @@ snapshots: clsx: 2.1.1 flowbite: 3.1.2(rollup@4.36.0) svelte: 5.33.13 - tailwind-merge: 3.3.0 + tailwind-merge: 3.3.1 tailwind-variants: 1.0.0(tailwindcss@4.1.8) tailwindcss: 4.1.8 transitivePeerDependencies: @@ -7851,7 +7854,7 @@ snapshots: tailwind-merge@3.0.2: {} - tailwind-merge@3.3.0: {} + tailwind-merge@3.3.1: {} tailwind-variants@1.0.0(tailwindcss@4.1.8): dependencies: