From 3bfc60cd498b5c0cd5ce769d5a6810fd88450215 Mon Sep 17 00:00:00 2001 From: Kris Urbas <605420+krzysu@users.noreply.github.com> Date: Thu, 6 Feb 2025 17:35:04 +0100 Subject: [PATCH 1/5] feat: upgrade to tailwind v4 --- .../app/components/ui/button.tsx | 2 +- .../app/components/ui/dialog.tsx | 2 +- .../app/components/ui/input.tsx | 2 +- .../app/components/ui/inputWithIcon.tsx | 2 +- .../app/components/ui/textarea.tsx | 2 +- .../app/components/ui/toast.tsx | 8 +- .../circle-demo-webapp/app/routes/_index.tsx | 2 +- packages/circle-demo-webapp/app/tailwind.css | 24 +- packages/circle-demo-webapp/package.json | 3 +- packages/circle-demo-webapp/postcss.config.js | 3 +- packages/circle-react-elements/package.json | 2 +- .../circle-react-elements/postcss.config.js | 3 +- .../src/components/TokenItem/TokenItem.tsx | 2 +- .../TokenSelect/TokenSelectItem.tsx | 2 +- .../WalletBalance/WalletBalance.tsx | 2 +- .../src/components/ui/button.tsx | 2 +- .../src/components/ui/input.tsx | 2 +- .../src/components/ui/select.tsx | 4 +- .../src/components/ui/textarea.tsx | 2 +- .../src/styles/tailwind.css | 24 +- yarn.lock | 221 +++++++++++++++--- 21 files changed, 259 insertions(+), 57 deletions(-) diff --git a/packages/circle-demo-webapp/app/components/ui/button.tsx b/packages/circle-demo-webapp/app/components/ui/button.tsx index e4998e6..ea6b163 100644 --- a/packages/circle-demo-webapp/app/components/ui/button.tsx +++ b/packages/circle-demo-webapp/app/components/ui/button.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import { cn } from '~/lib/utils'; export const buttonVariants = cva( - 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', + 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', { variants: { variant: { diff --git a/packages/circle-demo-webapp/app/components/ui/dialog.tsx b/packages/circle-demo-webapp/app/components/ui/dialog.tsx index 9f93d1d..eea0417 100644 --- a/packages/circle-demo-webapp/app/components/ui/dialog.tsx +++ b/packages/circle-demo-webapp/app/components/ui/dialog.tsx @@ -54,7 +54,7 @@ const DialogContent = React.forwardRef< {...props} > {children} - + Close diff --git a/packages/circle-demo-webapp/app/components/ui/input.tsx b/packages/circle-demo-webapp/app/components/ui/input.tsx index fdb8b27..596a43a 100644 --- a/packages/circle-demo-webapp/app/components/ui/input.tsx +++ b/packages/circle-demo-webapp/app/components/ui/input.tsx @@ -15,7 +15,7 @@ const Input = React.forwardRef( ( ( return (