diff --git a/web/package.json b/web/package.json index 5cbc0423..289096cf 100644 --- a/web/package.json +++ b/web/package.json @@ -49,6 +49,8 @@ "@atcute/client": "^5.1.1", "@atcute/identity-resolver": "^2.0.1", "@atcute/lexicons": "^2.0.2", - "@atcute/oauth-browser-client": "^4.0.1" + "@atcute/oauth-browser-client": "^4.0.1", + "tailwind-merge": "^3.6.0", + "tailwind-variants": "^3.2.2" } } diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 7279816c..d3a7e468 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -23,6 +23,12 @@ importers: '@atcute/oauth-browser-client': specifier: ^4.0.1 version: 4.0.1(@atcute/identity-resolver@2.0.1(@atcute/identity@2.0.1(@atcute/lexicons@2.0.2)(typescript@6.0.3))(@atcute/lexicons@2.0.2)(typescript@6.0.3))(@atcute/lexicons@2.0.2)(typescript@6.0.3) + tailwind-merge: + specifier: ^3.6.0 + version: 3.6.0 + tailwind-variants: + specifier: ^3.2.2 + version: 3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.2) devDependencies: '@eslint/js': specifier: ^10.0.1 @@ -1496,6 +1502,19 @@ packages: resolution: {integrity: sha512-/d0QHehmRuJW8gVz395MTkPcPozxzdjBMBE8oEYGz8O3b9KTMzzQ9ZHJQLuFKOHOPQbU6kx/X4iid/EBBzH7iw==} engines: {node: '>=18'} + tailwind-merge@3.6.0: + resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==} + + tailwind-variants@3.2.2: + resolution: {integrity: sha512-Mi4kHeMTLvKlM98XPnK+7HoBPmf4gygdFmqQPaDivc3DpYS6aIY6KiG/PgThrGvii5YZJqRsPz0aPyhoFzmZgg==} + engines: {node: '>=16.x', pnpm: '>=7.x'} + peerDependencies: + tailwind-merge: '>=3.0.0' + tailwindcss: '*' + peerDependenciesMeta: + tailwind-merge: + optional: true + tailwindcss@4.3.2: resolution: {integrity: sha512-WtctNNSH8A9jlMIqxzuYumOHU5uGZyRv0Q5svQl+oEPy5w84YpBxdb7MdqyiSPQge5jTJ6zFQLq0PFygdccSBA==} @@ -2981,6 +3000,14 @@ snapshots: transitivePeerDependencies: - '@typescript-eslint/types' + tailwind-merge@3.6.0: {} + + tailwind-variants@3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.2): + dependencies: + tailwindcss: 4.3.2 + optionalDependencies: + tailwind-merge: 3.6.0 + tailwindcss@4.3.2: {} tapable@2.3.3: {} diff --git a/web/src/lib/components/ui/Button.svelte b/web/src/lib/components/ui/Button.svelte index 2d2abd65..43e56ee5 100644 --- a/web/src/lib/components/ui/Button.svelte +++ b/web/src/lib/components/ui/Button.svelte @@ -1,3 +1,48 @@ + + {#if href} {:else} - {/if} - - diff --git a/web/src/lib/components/ui/Dropdown.svelte b/web/src/lib/components/ui/Dropdown.svelte index 4f1c2c73..fa2eadbc 100644 --- a/web/src/lib/components/ui/Dropdown.svelte +++ b/web/src/lib/components/ui/Dropdown.svelte @@ -1,5 +1,30 @@ -