From a39cbd3a7f37cc607ce6a17e5c47490042fba107 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 1 Jul 2024 14:34:06 +0200 Subject: [PATCH] chore(Button): improve `outline`, `soft` and `ghost` variants --- src/theme/button.ts | 6 +-- .../__snapshots__/Button.spec.ts.snap | 6 +-- .../__snapshots__/Pagination.spec.ts.snap | 48 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/theme/button.ts b/src/theme/button.ts index 155cb441..a3471a0a 100644 --- a/src/theme/button.ts +++ b/src/theme/button.ts @@ -78,11 +78,11 @@ export default (options: Required) => ({ })), ...options.colors.map((color: string) => ({ color, variant: 'outline', - class: `ring ring-inset ring-current text-${color}-500 dark:text-${color}-400 hover:bg-${color}-50 disabled:bg-transparent dark:hover:bg-${color}-950 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-${color}-500 dark:focus-visible:ring-${color}-400` + class: `ring ring-inset ring-current text-${color}-500 dark:text-${color}-400 hover:bg-${color}-500/20 disabled:bg-transparent dark:hover:bg-${color}-400/20 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-${color}-500 dark:focus-visible:ring-${color}-400` })), ...options.colors.map((color: string) => ({ color, variant: 'soft', - class: `text-${color}-500 dark:text-${color}-400 bg-${color}-50 hover:bg-${color}-100 disabled:bg-${color}-50 dark:bg-${color}-950 dark:hover:bg-${color}-900 dark:disabled:bg-${color}-950 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-${color}-500 dark:focus-visible:ring-${color}-400` + class: `text-${color}-500 dark:text-${color}-400 bg-${color}-500/10 hover:bg-${color}-500/20 disabled:bg-${color}-500/10 dark:bg-${color}-400/10 dark:hover:bg-${color}-400/20 dark:disabled:bg-${color}-400/10 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-${color}-500 dark:focus-visible:ring-${color}-400` })), ...options.colors.map((color: string) => ({ color, variant: 'subtle', @@ -90,7 +90,7 @@ export default (options: Required) => ({ })), ...options.colors.map((color: string) => ({ color, variant: 'ghost', - class: `text-${color}-500 dark:text-${color}-400 hover:bg-${color}-50 disabled:bg-transparent dark:hover:bg-${color}-950 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-${color}-500 dark:focus-visible:ring-${color}-400` + class: `text-${color}-500 dark:text-${color}-400 hover:bg-${color}-500/20 disabled:bg-transparent dark:hover:bg-${color}-400/20 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-${color}-500 dark:focus-visible:ring-${color}-400` })), ...options.colors.map((color: string) => ({ color, variant: 'link', diff --git a/test/components/__snapshots__/Button.spec.ts.snap b/test/components/__snapshots__/Button.spec.ts.snap index 558fff3c..752f469a 100644 --- a/test/components/__snapshots__/Button.spec.ts.snap +++ b/test/components/__snapshots__/Button.spec.ts.snap @@ -180,7 +180,7 @@ exports[`Button > renders with trailingIcon correctly 1`] = ` exports[`Button > renders with ui correctly 1`] = `""`; exports[`Button > renders with variant ghost correctly 1`] = ` -"" @@ -194,14 +194,14 @@ exports[`Button > renders with variant link correctly 1`] = ` `; exports[`Button > renders with variant outline correctly 1`] = ` -"" `; exports[`Button > renders with variant soft correctly 1`] = ` -"" diff --git a/test/components/__snapshots__/Pagination.spec.ts.snap b/test/components/__snapshots__/Pagination.spec.ts.snap index 0aaf36c3..d55c9ed0 100644 --- a/test/components/__snapshots__/Pagination.spec.ts.snap +++ b/test/components/__snapshots__/Pagination.spec.ts.snap @@ -1451,31 +1451,31 @@ exports[`Pagination > renders with ui correctly 1`] = ` exports[`Pagination > renders with variant ghost correctly 1`] = ` "