From a13a4b5e4fcf8cbbcf311787b51d82188c87cc97 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Mon, 10 Jan 2022 11:02:33 +0100
Subject: [PATCH] chore: design improvements

---
 src/presets/tailwindui.ts                  | 17 +++++-------
 src/runtime/components/forms/Checkbox.vue  |  4 +--
 src/runtime/components/forms/FormGroup.vue | 31 +++++++++-------------
 src/runtime/components/forms/Radio.vue     |  4 +--
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/presets/tailwindui.ts b/src/presets/tailwindui.ts
index ed58f607..59d34d07 100644
--- a/src/presets/tailwindui.ts
+++ b/src/presets/tailwindui.ts
@@ -47,17 +47,12 @@ const button = {
   },
   variant: {
     ...colors.reduce((acc: any, color) => {
-      acc[color] = `shadow-sm border border-transparent text-white bg-${color}-600 hover:bg-${color}-700 disabled:bg-${color}-600 focus:ring-2 focus:ring-${color}-200`
+      acc[color] = `shadow-sm border border-transparent text-white bg-${color}-600 hover:bg-${color}-700 disabled:bg-${color}-600 focus:ring-2 focus:ring-offset-2 focus:ring-${color}-500`
       return acc
     }, {}),
-    primary: 'shadow-sm border border-transparent text-white bg-primary-600 hover:bg-primary-700 disabled:bg-primary-600 focus:ring-2 focus:ring-primary-200',
-    secondary: 'border border-transparent text-primary-700 bg-primary-100 hover:bg-primary-200 disabled:bg-primary-100 focus:ring-2 focus:ring-primary-500',
-    white: 'shadow-sm border u-border-gray-300 u-text-gray-700 u-bg-white hover:u-bg-gray-50 disabled:u-bg-white focus:ring-1 focus:ring-primary-500 focus:border-primary-500 dark:focus:border-primary-500',
-    'white-hover': 'border border-transparent u-text-gray-500 hover:u-text-gray-700 focus:u-text-gray-700 bg-transparent hover:bg-gray-100 focus:bg-gray-100 dark:hover:bg-gray-900 dark:focus:bg-gray-900 disabled:u-text-gray-500',
-    gray: 'shadow-sm border u-border-gray-300 u-text-gray-500 hover:u-text-gray-700 focus:u-text-gray-700 bg-gray-50 dark:bg-gray-800 disabled:u-text-gray-500 focus:ring-primary-500 focus:border-primary-500 dark:focus:border-primary-500',
-    'gray-hover': 'border border-transparent u-text-gray-500 hover:u-text-gray-700 focus:u-text-gray-700 bg-transparent hover:bg-gray-100 focus:bg-gray-100 dark:hover:bg-gray-800 dark:focus:bg-gray-800 disabled:u-text-gray-500',
-    black: 'border border-transparent u-text-white u-bg-gray-800 hover:u-bg-gray-900 focus:u-bg-gray-900',
-    'black-hover': 'border border-transparent u-text-gray-500 hover:u-text-gray-900 focus:u-text-gray-700 bg-transparent hover:bg-white dark:hover:bg-black focus:bg-white dark:focus:bg-black',
+    primary: 'shadow-sm border border-transparent text-white bg-primary-600 hover:bg-primary-700 disabled:bg-primary-600 focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
+    secondary: 'border border-transparent text-primary-700 bg-primary-100 hover:bg-primary-200 disabled:bg-primary-100 focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
+    white: 'shadow-sm border u-border-gray-300 u-text-gray-700 u-bg-white hover:u-bg-gray-50 disabled:u-bg-white focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
     transparent: 'border border-transparent u-text-gray-500 hover:u-text-gray-700 focus:u-text-gray-700 disabled:hover:u-text-gray-500',
     link: 'border border-transparent text-primary-500 hover:text-primary-700 focus:text-primary-700'
   },
@@ -211,7 +206,7 @@ const select = {
 
 const radio = {
   wrapper: 'relative flex items-start',
-  base: 'h-4 w-4 text-primary-600 focus:ring-1 focus:ring-primary-500 u-border-gray-300 dark:checked:border-primary-600 disabled:opacity-50 disabled:cursor-not-allowed',
+  base: 'h-4 w-4 text-primary-600 focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 u-border-gray-300 dark:checked:border-primary-600 disabled:opacity-50 disabled:cursor-not-allowed',
   label: 'font-medium u-text-gray-700',
   required: 'text-red-400',
   help: 'u-text-gray-500'
@@ -238,7 +233,7 @@ const container = {
 }
 
 const toggle = {
-  base: 'relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer focus:outline-none focus:ring-2 focus:ring-primary-500',
+  base: 'relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
   active: 'bg-primary-600',
   inactive: 'u-bg-gray-200',
   container: {
diff --git a/src/runtime/components/forms/Checkbox.vue b/src/runtime/components/forms/Checkbox.vue
index 6b9a41b7..47c923fb 100644
--- a/src/runtime/components/forms/Checkbox.vue
+++ b/src/runtime/components/forms/Checkbox.vue
@@ -14,9 +14,9 @@
         @blur="$emit('blur', $event)"
       >
     </div>
-    <div v-if="label" class="ml-3 text-sm">
+    <div v-if="label || $slots.label" class="ml-3 text-sm">
       <label :for="name" :class="labelClass">
-        {{ label }}
+        <slot name="label">{{ label }}</slot>
         <span v-if="required" :class="requiredClass">*</span>
       </label>
       <p v-if="help" :class="helpClass">
diff --git a/src/runtime/components/forms/FormGroup.vue b/src/runtime/components/forms/FormGroup.vue
index 3f278c1f..944c7424 100644
--- a/src/runtime/components/forms/FormGroup.vue
+++ b/src/runtime/components/forms/FormGroup.vue
@@ -1,24 +1,17 @@
 <template>
   <div :class="wrapperClass">
-    <slot name="label">
-      <div :class="labelWrapperClass">
-        <label
-          v-if="label"
-          :for="name"
-          :class="labelClass"
-          @click="onLabelClick"
-        >
-          {{ label }}
-          <span v-if="required" :class="requiredClass">*</span>
-        </label>
-        <span v-if="$slots.hint || hint" :class="hintClass">
-          <slot name="hint">{{ hint }}</slot>
-        </span>
-      </div>
-      <p v-if="description" :class="descriptionClass">
-        {{ description }}
-      </p>
-    </slot>
+    <div v-if="label || $slots.label" :class="labelWrapperClass">
+      <label :for="name" :class="labelClass">
+        <slot name="label">{{ label }}</slot>
+        <span v-if="required" :class="requiredClass">*</span>
+      </label>
+      <span v-if="$slots.hint || hint" :class="hintClass">
+        <slot name="hint">{{ hint }}</slot>
+      </span>
+    </div>
+    <p v-if="description" :class="descriptionClass">
+      {{ description }}
+    </p>
     <div :class="!!label && containerClass">
       <slot />
       <p v-if="help" :class="helpClass">
diff --git a/src/runtime/components/forms/Radio.vue b/src/runtime/components/forms/Radio.vue
index 508642cc..74d437c1 100644
--- a/src/runtime/components/forms/Radio.vue
+++ b/src/runtime/components/forms/Radio.vue
@@ -14,9 +14,9 @@
         @blur="$emit('blur', $event)"
       >
     </div>
-    <div v-if="label" class="ml-3 text-sm">
+    <div v-if="label || $slots.label" class="ml-3 text-sm">
       <label :for="`${name}-${value}`" :class="labelClass">
-        {{ label }}
+        <slot name="label">{{ label }}</slot>
         <span v-if="required" :class="requiredClass">*</span>
       </label>
       <p v-if="help" :class="helpClass">