From 429791dab0fbb84bae1e1e13e7e688708f0b5c98 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 12 Jun 2023 14:24:35 +0200 Subject: [PATCH] fix(Radio/Checkbox): split preset as `indeterminate` is checkbox only --- src/runtime/app.config.ts | 10 +++++++--- src/runtime/components/forms/Checkbox.vue | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/runtime/app.config.ts b/src/runtime/app.config.ts index 7d9e449f..f184bdf5 100644 --- a/src/runtime/app.config.ts +++ b/src/runtime/app.config.ts @@ -474,15 +474,19 @@ const selectMenu = { const radio = { wrapper: 'relative flex items-start', - base: 'h-4 w-4 text-primary-500 dark:text-primary-400 focus-visible:ring-2 focus-visible:ring-offset-2 bg-white dark:bg-gray-900 dark:checked:bg-current dark:checked:border-transparent dark:indeterminate:bg-current dark:indeterminate:border-transparent focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400 focus-visible:ring-offset-white dark:focus-visible:ring-offset-gray-900 border-gray-300 dark:border-gray-700 disabled:opacity-50 disabled:cursor-not-allowed focus:ring-0 focus:ring-transparent focus:ring-offset-transparent', + base: 'h-4 w-4 text-primary-500 dark:text-primary-400 focus-visible:ring-2 focus-visible:ring-offset-2 bg-white dark:bg-gray-900 dark:checked:bg-current dark:checked:border-transparent focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400 focus-visible:ring-offset-white dark:focus-visible:ring-offset-gray-900 border-gray-300 dark:border-gray-700 disabled:opacity-50 disabled:cursor-not-allowed focus:ring-0 focus:ring-transparent focus:ring-offset-transparent', label: 'font-medium text-gray-700 dark:text-gray-200', required: 'text-red-500 dark:text-red-400', help: 'text-gray-500 dark:text-gray-400' } const checkbox = { - ...radio, - base: radio.base + ' rounded' + wrapper: 'relative flex items-start', + base: 'h-4 w-4 text-primary-500 dark:text-primary-400 focus-visible:ring-2 focus-visible:ring-offset-2 bg-white dark:bg-gray-900 dark:checked:bg-current dark:checked:border-transparent dark:indeterminate:bg-current dark:indeterminate:border-transparent focus-visible:ring-primary-500 dark:focus-visible:ring-primary-400 focus-visible:ring-offset-white dark:focus-visible:ring-offset-gray-900 border-gray-300 dark:border-gray-700 disabled:opacity-50 disabled:cursor-not-allowed focus:ring-0 focus:ring-transparent focus:ring-offset-transparent', + rounded: 'rounded', + label: 'font-medium text-gray-700 dark:text-gray-200', + required: 'text-red-500 dark:text-red-400', + help: 'text-gray-500 dark:text-gray-400' } const toggle = { diff --git a/src/runtime/components/forms/Checkbox.vue b/src/runtime/components/forms/Checkbox.vue index 4717ed48..f3579320 100644 --- a/src/runtime/components/forms/Checkbox.vue +++ b/src/runtime/components/forms/Checkbox.vue @@ -12,7 +12,7 @@ :indeterminate="indeterminate" type="checkbox" class="form-checkbox" - :class="[ui.base, ui.custom]" + :class="[ui.base, ui.rounded, ui.custom]" @focus="$emit('focus', $event)" @blur="$emit('blur', $event)" >