@indielayer/ui 0.0.0-dev-20240129122517 → 0.0.0-dev-20240205224808

package/src/components/inputFooter/theme/InputFooter.base.theme.ts

@@ -2,9 +2,9 @@ import type { InputFooterTheme } from '../InputFooter.vue'
 
 const theme: InputFooterTheme = {
   classes: {
-    wrapper: 'min-h-[1.3rem] text-sm mt-1',
-    helperText: 'text-gray-500 dark:text-gray-400',
-    errorText: 'text-red-500 dark:text-red-400',
+    wrapper: 'text-xs mt-1',
+    helperText: 'text-secondary-500 dark:text-secondary-400',
+    errorText: 'text-error-500 dark:text-error-400',
   },
 }
 

package/src/components/inputFooter/theme/InputFooter.carbon.theme.ts

@@ -3,8 +3,8 @@ import type { InputFooterTheme } from '../InputFooter.vue'
 const theme: InputFooterTheme = {
   classes: {
     wrapper: 'text-xs mt-1',
-    helperText: 'text-gray-500 dark:text-gray-400',
-    errorText: 'text-red-500 dark:text-red-400',
+    helperText: 'text-secondary-500 dark:text-secondary-400',
+    errorText: 'text-error-500 dark:text-error-400',
   },
 }
 

package/src/components/label/Label.vue

@@ -10,6 +10,7 @@ const labelProps = {
     type: String,
     default: 'label',
   },
+  tooltip: String,
 }
 
 export type LabelProps = ExtractPublicPropTypes<typeof labelProps>
@@ -29,6 +30,7 @@ export default {
 import type { ExtractPublicPropTypes } from 'vue'
 import { useTheme, type ThemeComponent } from '../../composables/useTheme'
 import { useCommon } from '../../composables/useCommon'
+import XToggleTip from '../tooltip/ToggleTip.vue'
 
 const props = defineProps(labelProps)
 
@@ -47,7 +49,8 @@ const { styles, classes, className } = useTheme('Label', {}, props)
       :title="label"
       :class="classes.label"
     >
-      {{ label }}
+      <span>{{ label }}</span>
+      <x-toggle-tip v-if="tooltip" :content="tooltip"/>
     </component>
     <slot></slot>
   </component>

package/src/components/label/theme/Label.base.theme.ts

@@ -5,14 +5,14 @@ const theme: LabelTheme = {
     wrapper: ({ props }) => {
       const classes  = ['block relative align-bottom focus:outline-none']
 
-      if (props.isInsideForm) classes.push('mb-3')
+      if (props.isInsideForm) classes.push('mb-4')
       if (props.block) classes.push('w-full')
 
       return classes
     },
 
     label: ({ props }) => {
-      const classes = 'font-medium text-gray-800 dark:text-gray-200 mb-1'
+      const classes = 'flex items-center gap-2 font-medium text-secondary-800 dark:text-secondary-200 mb-1'
 
       if (props.size === 'xs') return classes + ' text-xs'
       else if (props.size === 'sm') return classes + ' text-sm'

package/src/components/label/theme/Label.carbon.theme.ts

@@ -1,7 +1,5 @@
 import type { LabelTheme } from '../Label.vue'
 
-import BaseTheme from './Label.base.theme'
-
 const theme: LabelTheme = {
   classes: {
     wrapper: ({ props }) => {
@@ -13,7 +11,7 @@ const theme: LabelTheme = {
       return classes
     },
 
-    label: 'text-xs text-gray-500 dark:text-gray-200 mb-2',
+    label: 'text-xs text-secondary-500 dark:text-secondary-200 mb-2',
   },
 }
 

package/src/components/link/Link.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 const linkProps = {
-  ...useColors.props('primary'),
+  ...useColors.props('secondary'),
   tag: {
     type: String,
     default: 'a',

package/src/components/loader/theme/Loader.base.theme.ts

@@ -4,7 +4,7 @@ const theme: LoaderTheme = {
   classes: {
     wrapper: 'inline-flex items-center justify-center',
     iconSuccess: 'text-green-500',
-    iconError: 'text-red-500',
+    iconError: 'text-error-500',
     label: 'mx-2 text-sm',
   },
 }

package/src/components/loader/theme/Loader.carbon.theme.ts

@@ -4,7 +4,7 @@ const theme: LoaderTheme = {
   classes: {
     wrapper: 'inline-flex items-center justify-center',
     iconSuccess: 'text-green-500',
-    iconError: 'text-red-500',
+    iconError: 'text-error-500',
     label: 'mx-2 text-sm',
   },
 }

package/src/components/menu/Menu.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
 const menuProps = {
   ...useCommon.props(),
-  ...useColors.props('primary'),
+  ...useColors.props('secondary'),
   items: Array as PropType<MenuArrayItem[]>,
   collapsible: {
     type: Boolean,
@@ -104,12 +104,12 @@ const { styles, classes, className } = useTheme('Menu', {}, props)
               :filled="item.filled || filled"
               :size="item.size || size"
               :disabled="disabled || item.disabled"
-              class="pr-10 font-medium"
+              class="font-medium"
             />
           </template>
           <template #content="{ expand }">
             <x-menu
-              class="border-l ml-4 border-gray-100 dark:border-gray-700"
+              class="border-l ml-4 border-secondary-100 dark:border-secondary-700"
               :class="{ 'pl-1': filled }"
               :items="item.items"
               :color="item.color || color"
@@ -138,7 +138,7 @@ const { styles, classes, className } = useTheme('Menu', {}, props)
             @click="$emit('item-click')"
           />
           <x-menu
-            class="x-menu-inner space-y-1 ml-4 border-l border-gray-100 dark:border-gray-700"
+            class="x-menu-inner space-y-1 ml-4 border-l border-secondary-100 dark:border-secondary-700"
             :class="{ 'pl-1': filled }"
             :items="item.items"
             :color="item.color || color"

package/src/components/menu/theme/MenuItem.base.theme.ts

@@ -3,21 +3,17 @@ import type { MenuItemTheme } from '../MenuItem.vue'
 const theme: MenuItemTheme = {
   classes: {
     wrapper: ({ props, data }) => {
-      const classes: any[] = ['relative !flex items-center whitespace-nowrap px-3']
+      const classes = ['relative !flex items-center whitespace-nowrap px-3']
 
-      classes.push({
-        'font-medium': data.isActive,
-        'cursor-pointer': !props.disabled,
+      if (!props.disabled) classes.push('cursor-pointer')
+      if (data.isActive) classes.push('font-medium')
+      if (props.rounded) classes.push('rounded')
 
-        // size
-        'py-1 text-xs': props.size === 'xs',
-        'py-2 text-sm': props.size === 'sm',
-        'py-1.5': !props.size || !['xs', 'sm', 'lg', 'xl'].includes(props.size),
-        'py-3': props.size === 'lg',
-        'py-4 text-lg': props.size === 'xl',
-
-        'rounded': props.rounded,
-      })
+      if (props.size === 'xs') classes.push('py-1 text-xs')
+      else if (props.size === 'sm') classes.push('py-1.5 text-sm')
+      else if (props.size === 'lg') classes.push('py-3')
+      else if (props.size === 'xl') classes.push('py-4 text-lg')
+      else classes.push('py-1.5')
 
       return classes
     },
@@ -25,23 +21,23 @@ const theme: MenuItemTheme = {
 
   styles: ({ colors, props, css, data }) => {
     const color = colors.getPalette(props.color || 'gray')
-    const gray = colors.getPalette('gray')
+    const secondary = colors.getPalette('secondary')
 
     if (props.disabled) return css.variables({
-      text: gray[300],
+      text: secondary[300],
       dark: {
-        text: gray[600],
+        text: secondary[600],
       },
     })
 
     if (props.filled) {
       if (data.isActive) {
         return css.variables({
-          bg: props.selected ? color[100] : color[50],
-          text: color[500],
+          bg: props.selected ? color[100] : color[200],
+          text: color[800],
           hover: {
-            bg: props.selected ? color[100] : color[50],
-            text: color[500],
+            bg: props.selected ? color[200] : color[200],
+            text: color[800],
           },
           dark: {
             bg: props.selected ? color[700] : color[700],
@@ -55,18 +51,18 @@ const theme: MenuItemTheme = {
       }
 
       return css.variables({
-        bg: props.selected ? gray[50] : 'transparent',
-        text: gray[800],
+        bg: props.selected ? secondary[100] : 'transparent',
+        text: secondary[800],
         hover: {
-          bg: gray[50],
-          text: gray[900],
+          bg: secondary[100],
+          text: secondary[900],
         },
         dark: {
-          bg: props.selected ? gray[800] : 'transparent',
-          text: gray[200],
+          bg: props.selected ? secondary[800] : 'transparent',
+          text: secondary[200],
           hover: {
-            bg: gray[800],
-            text: gray[100],
+            bg: secondary[600],
+            text: secondary[100],
           },
         },
       })
@@ -90,16 +86,16 @@ const theme: MenuItemTheme = {
     }
 
     return css.variables({
-      text: gray[800],
+      text: secondary[800],
       hover: {
-        text: gray[900],
-        border: gray[300],
+        text: secondary[900],
+        border: secondary[300],
       },
       dark: {
-        text: gray[300],
+        text: secondary[300],
         hover: {
-          text: gray[200],
-          border: gray[800],
+          text: secondary[200],
+          border: secondary[800],
         },
       },
     })

package/src/components/modal/Modal.vue

@@ -36,6 +36,7 @@ const modalProps = {
     type: [Array, Object] as PropType<[FormError[], FormError]>,
     default: () => ([]),
   },
+  persistent: Boolean,
 }
 
 export type ModalSize = typeof modalSize[number]
@@ -88,7 +89,9 @@ watch(value, (val) => {
 
   if (val) {
     setTimeout(() => {
-      stopClickOutside = onClickOutside(modalRef, close)
+      stopClickOutside = onClickOutside(modalRef, clickOutsideCallback, {
+        ignore: ['.v-popper__popper'],
+      })
     })
   }
 })
@@ -120,7 +123,11 @@ async function checkVisibiliy() {
 if (typeof window !== 'undefined') useEventListener(document, 'keydown', onKeyDown)
 
 function onKeyDown(event: KeyboardEvent) {
-  if (event.key === 'Escape' && value.value) close()
+  if (event.key === 'Escape' && value.value && !props.persistent) close()
+}
+
+function clickOutsideCallback() {
+  if (!props.persistent) close()
 }
 
 function close() {
@@ -182,7 +189,7 @@ defineExpose({ open, close })
           role="dialog"
           aria-modal="true"
           aria-labelledby="modal-headline"
-          @submit="$emit('submit')"
+          @submit="(isValid: boolean) => $emit('submit', isValid)"
         >
           <slot name="image"></slot>
           <div v-if="hasHeader" :class="classes.header">
@@ -204,7 +211,7 @@ defineExpose({ open, close })
           <x-button
             v-if="showClose"
             ghost
-            size="lg"
+            size="sm"
             tabindex="-1"
             :icon="closeIcon"
             :class="classes.closeIcon"

package/src/components/modal/theme/Modal.base.theme.ts

@@ -5,7 +5,7 @@ const theme: ModalTheme = {
     wrapper: 'fixed z-40 inset-0 overflow-y-auto transition-all',
 
     backdrop: ({ data }) => {
-      const classes = ['fixed inset-0 bg-gray-500 dark:bg-black transition-opacity']
+      const classes = ['fixed inset-0 bg-secondary-500 dark:bg-black transition-opacity']
 
       if (data.visible) classes.push('ease-out duration-200 opacity-30 dark:opacity-70')
       else classes.push('ease-in duration-100 opacity-0')
@@ -14,7 +14,7 @@ const theme: ModalTheme = {
     },
 
     modal: ({ props, data }) => {
-      const classes = ['relative flex flex-col z-10 bg-white dark:bg-gray-900 rounded-md shadow-lg transform transition-all overflow-hidden max-h-full w-full']
+      const classes = ['relative flex flex-col z-10 bg-white dark:bg-secondary-900 rounded-md shadow-lg transform transition-all overflow-hidden max-h-full w-full']
 
       if (data.visible) classes.push('ease-out duration-200 opacity-100 translate-y-0 sm:scale-100')
       else classes.push('ease-in duration-200 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95')
@@ -33,14 +33,17 @@ const theme: ModalTheme = {
     header: 'text-lg pl-6 py-4 border-b pr-12',
 
     content: 'px-6 py-4',
+    actions: ({ props, slots }) => {
+      const classes = ['flex gap-4 bg-secondary-50 dark:bg-secondary-800 p-4 justify-end']
 
-    actions: 'bg-slate-50 dark:bg-gray-800 p-4 grid grid-flow-col gap-4',
+      return classes
+    },
 
-    label: 'text-xs text-gray-500 mb-1',
+    label: 'text-xs text-secondary-500 mb-1',
 
-    title: 'text-xl font-semibold mb-4',
+    title: 'text-xl font-semibold',
 
-    description: 'text-sm',
+    description: 'text-sm mb-8',
   },
 }
 

package/src/components/modal/theme/Modal.carbon.theme.ts

@@ -5,7 +5,7 @@ const theme: ModalTheme = {
     wrapper: 'fixed z-40 inset-0 overflow-y-auto transition-all',
 
     backdrop: ({ data }) => {
-      const classes = ['fixed inset-0 bg-gray-500 dark:bg-black transition-opacity']
+      const classes = ['fixed inset-0 bg-secondary-500 dark:bg-black transition-opacity']
 
       if (data.visible) classes.push('ease-out duration-200 opacity-70 dark:opacity-70')
       else classes.push('ease-in duration-100 opacity-0')
@@ -14,7 +14,7 @@ const theme: ModalTheme = {
     },
 
     modal: ({ props, data }) => {
-      const classes = ['relative flex flex-col z-10 bg-gray-200 dark:bg-gray-900 shadow-lg transform transition-all overflow-hidden max-h-full w-full']
+      const classes = ['relative flex flex-col z-10 bg-secondary-200 dark:bg-secondary-900 shadow-lg transform transition-all overflow-hidden max-h-full w-full']
 
       if (data.visible) classes.push('ease-out duration-200 opacity-100 translate-y-0 sm:scale-100')
       else classes.push('ease-in duration-200 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95')
@@ -49,7 +49,7 @@ const theme: ModalTheme = {
       return classes
     },
 
-    label: 'text-xs text-gray-500 mb-1',
+    label: 'text-xs text-secondary-500 mb-1',
 
     title: 'text-xl mb-4',
 

package/src/components/notifications/Notifications.vue

@@ -308,7 +308,7 @@ defineExpose({ log, info, success, warn, warning: warn, error })
           <x-icon
             v-if="notification.removable"
             :icon="closeIcon"
-            class="text-gray-400 hover:text-gray-500 ml-3 cursor-pointer"
+            class="text-secondary-400 hover:text-secondary-500 ml-3 cursor-pointer"
             @click="() => {remove(notification)}"
           />
         </li>

package/src/components/notifications/theme/Notifications.base.theme.ts

@@ -6,7 +6,7 @@ const theme: NotificationsTheme = {
 
     list: 'flex flex-col items-end w-full sm:w-[520px] px-4',
 
-    item: 'w-full flex items-center rounded-md px-4 py-3 bg-gray-800 dark:bg-gray-50 text-white dark:text-gray-900 border border-gray-700 dark:border-gray-100',
+    item: 'w-full flex items-center rounded-md px-4 py-3 bg-secondary-800 dark:bg-secondary-50 text-white dark:text-secondary-900 border border-secondary-700 dark:border-secondary-100',
   },
 }
 

package/src/components/notifications/theme/Notifications.carbon.theme.ts

@@ -7,7 +7,7 @@ const theme: NotificationsTheme = {
     list: 'flex flex-col items-end w-full sm:w-[520px] px-4',
 
     item: () => {
-      const classes = ['w-full flex items-center px-4 py-3 bg-gray-800 dark:bg-gray-50 text-white dark:text-gray-900 border-l-2 border-[color:var(--x-notification-icon)]']
+      const classes = ['w-full flex items-center px-4 py-3 bg-secondary-800 dark:bg-secondary-50 text-white dark:text-secondary-900 border-l-2 border-[color:var(--x-notification-icon)]']
 
       return classes
     },

package/src/components/pagination/Pagination.vue

@@ -111,7 +111,7 @@ const { styles, classes, className } = useTheme('Pagination', {}, props)
         @click="prevPage"
       />
       <div class="mx-9 flex items-center">
-        <span class="text-gray-600 mr-2">Page</span>
+        <span class="text-secondary-600 mr-2">Page</span>
         <x-input
           v-model="quickInput"
           :size="size"
@@ -119,7 +119,7 @@ const { styles, classes, className } = useTheme('Pagination', {}, props)
           hide-footer
           @keydown.enter="onQuickInput"
         />
-        <span class="text-gray-600 ml-2">of {{ totalPages }}</span>
+        <span class="text-secondary-600 ml-2">of {{ totalPages }}</span>
       </div>
       <x-button
         :icon-left="nextIcon"
@@ -163,7 +163,7 @@ const { styles, classes, className } = useTheme('Pagination', {}, props)
         class="rounded-full cursor-pointer"
         :class="[
           classes.dots,
-          i === modelValue ? 'bg-[color:var(--x-pagination-bg)]': 'bg-gray-100 hover:bg-gray-200'
+          i === modelValue ? 'bg-[color:var(--x-pagination-bg)]': 'bg-secondary-100 hover:bg-secondary-200'
         ]"
         @click="$emit('update:modelValue', i)"
       ></li>

package/src/components/popover/Popover.vue

@@ -23,6 +23,10 @@ const popoverProps = {
     type: Array as PropType<Array<PopoverTriggerEvent>>,
     default: () => ['click'],
   },
+  hideArrow: {
+    type: Boolean,
+    default: true,
+  },
   showTriggers: [Array, Function] as PropType<Array<PopoverTriggerEvent> | ((triggers: Array<PopoverTriggerEvent>) => Array<PopoverTriggerEvent>)>,
   hideTriggers: [Array, Function] as PropType<Array<PopoverTriggerEvent> | ((triggers: Array<PopoverTriggerEvent>) => Array<PopoverTriggerEvent>)>,
   popperTriggers: Array as PropType<Array<PopoverTriggerEvent>>,
@@ -121,7 +125,8 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
     :eager-mount="eagerMount"
     :popper-class="[
       classes.content,
-      popperClass
+      popperClass,
+      hideArrow ? 'v-popper__popper--no-arrow' : '',
     ]"
     :compute-transform-origin="computeTransformOrigin"
     @show="() => { isOpen = true; $emit('show') }"
@@ -142,6 +147,9 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
 </template>
 
 <style lang="postcss">
+/* stylelint-disable no-duplicate-selectors */
+/* stylelint-disable no-descending-specificity */
+/* stylelint-disable selector-class-pattern */
 .resize-observer {
   position: absolute;
   top: 0;
@@ -168,7 +176,7 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
     z-index: -1;
   }
 }
-/* stylelint-disable selector-class-pattern */
+
 .v-popper__popper {
   z-index: 10000;
   top: 0;
@@ -202,4 +210,71 @@ const { styles, classes, className } = useTheme('Popover', {}, props)
   height: 100%;
   display: none;
 }
+
+.v-popper__arrow-container {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+}
+
+.v-popper__arrow-inner {
+  border-style: solid;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  visibility: hidden;
+  border-width: 7px;
+}
+.v-popper__arrow-outer { display: none; }
+
+.v-popper__popper[data-popper-placement^="top"] .v-popper__arrow-inner,
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-inner { left: -2px; }
+
+.v-popper__popper[data-popper-placement^="top"] .v-popper__arrow-inner {
+  border-bottom-width: 0;
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="top"] .v-popper__arrow-inner { top: -2px; }
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-container { top: 0; }
+
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-inner {
+  border-top-width: 0;
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-top-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="bottom"] .v-popper__arrow-inner { top: -4px; }
+
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-inner,
+.v-popper__popper[data-popper-placement^="right"] .v-popper__arrow-inner { top: -2px; }
+
+.v-popper__popper[data-popper-placement^="right"] .v-popper__arrow-inner {
+  border-left-width: 0;
+  border-left-color: transparent !important;
+  border-top-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="right"] .v-popper__arrow-inner { left: -4px; }
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-container { right: -10px; }
+
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-inner {
+  border-right-width: 0;
+  border-top-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+.v-popper__popper[data-popper-placement^="left"] .v-popper__arrow-inner { left: -2px; }
+
+.v-popper--theme-dropdown .v-popper__arrow-inner {
+  visibility: visible;
+  border-color: #374151;
+}
+
+.v-popper__popper--no-arrow .v-popper__arrow-container {
+  display: none;
+}
 </style>

package/src/components/popover/theme/PopoverContainer.base.theme.ts

@@ -2,7 +2,7 @@ import type { PopoverContainerTheme } from '../PopoverContainer.vue'
 
 const theme: PopoverContainerTheme = {
   classes: {
-    wrapper: 'block w-full bg-white dark:bg-gray-700 shadow-lg rounded-md border  border-gray-200 dark:border-gray-800',
+    wrapper: 'block w-full bg-white dark:bg-secondary-700 shadow-lg rounded-md border border-secondary-200 dark:border-secondary-800',
   },
 }
 

package/src/components/popover/theme/PopoverContainer.carbon.theme.ts

@@ -2,7 +2,7 @@ import type { PopoverContainerTheme } from '../PopoverContainer.vue'
 
 const theme: PopoverContainerTheme = {
   classes: {
-    wrapper: 'block w-full bg-gray-100 dark:bg-gray-700 shadow-lg border border-gray-200 dark:border-gray-800 text-sm',
+    wrapper: 'block w-full bg-secondary-100 dark:bg-secondary-700 shadow-lg border border-secondary-200 dark:border-secondary-800 text-sm',
   },
 }
 

package/src/components/progress/Progress.vue

@@ -53,7 +53,7 @@ const { styles, classes, className } = useTheme('Progress', {}, props)
     </div>
     <div
       v-if="gradient"
-      class="absolute h-full bg-gray-100 dark:bg-gray-700 right-0 top-0"
+      class="absolute h-full bg-secondary-100 dark:bg-secondary-700 right-0 top-0"
       :class="{ 'duration-150 transition-[width]': animate }"
       :style="{
         width: `${100 - percentage}%`

package/src/components/progress/theme/Progress.base.theme.ts

@@ -2,11 +2,11 @@ import type { ProgressTheme } from '../Progress.vue'
 
 const theme: ProgressTheme = {
   classes: {
-    wrapper: ({ props }) => `relative rounded bg-gray-100 dark:bg-gray-700 overflow-hidden pointer-events-none ${props.thick ? 'h-1.5' : 'h-1'}`,
+    wrapper: ({ props }) => `relative rounded bg-secondary-100 dark:bg-secondary-700 overflow-hidden pointer-events-none ${props.thick ? 'h-1.5' : 'h-1'}`,
 
     list: 'flex flex-col items-end w-full sm:w-[520px] px-4',
 
-    item: 'w-full flex items-center rounded-md px-4 py-3 bg-gray-800 dark:bg-gray-50 text-white dark:text-gray-900',
+    item: 'w-full flex items-center rounded-md px-4 py-3 bg-secondary-800 dark:bg-secondary-50 text-white dark:text-secondary-900',
   },
 
   styles: ({ props, colors, css }) => {

package/src/components/radio/theme/Radio.base.theme.ts

@@ -5,19 +5,19 @@ const theme: RadioTheme = {
     wrapper: ({ data }) => {
       const classes = ['inline-block relative cursor-pointer focus:outline-none group']
 
-      if (data.isInsideForm) classes.push('mb-3')
+      if (data.isInsideForm && !data.isInsideFormGroup) classes.push('mb-4')
 
       return classes
     },
 
     circle: ({ props }) => {
-      let c = 'rounded-full flex justify-center items-center shrink-0 border-2 outline-offset-2 outline-slate-300 dark:outline-slate-500 group-focus:outline-1 group-focus:outline'
+      const classes = ['rounded-full flex justify-center items-center shrink-0 border outline-offset-2 outline-slate-300 dark:outline-slate-500 group-focus:outline-1 group-focus:outline']
 
-      if (props.size === 'xs' || props.size === 'sm') c += ' h-4 w-4'
-      if (props.size === 'xl') c += ' h-6 w-6'
-      else c += ' h-5 w-5'
+      if (props.size === 'lg') classes.push('h-5 w-5')
+      else if (props.size === 'xl') classes.push('h-6 w-6')
+      else classes.push('h-4 w-4')
 
-      return c
+      return classes
     },
 
     circleIcon: ({ props, data }) => {
@@ -28,13 +28,13 @@ const theme: RadioTheme = {
       if (props.size === 'sm' || props.size === 'xs') c.push('h-2')
       else if (props.size === 'lg') c.push('h-2.5')
       else if (props.size === 'xl') c.push('h-3')
-      else c.push('h-[0.6rem]')
+      else c.push('h-2')
 
       return c
     },
 
     label: ({ props }) => {
-      let c = 'font-medium text-gray-800 dark:text-gray-200 pl-2'
+      let c = 'font-medium text-secondary-800 dark:text-secondary-200 pl-2'
 
       if (props.size === 'xs') c += ' text-xs'
       else if (props.size === 'sm') c += ' text-sm'
@@ -112,7 +112,7 @@ const theme: RadioTheme = {
           border: props.glow ? color[300] : gray[300],
           dark: {
             bg: gray[900],
-            border: props.glow ? color[300] : gray[300],
+            border: props.glow ? color[300] : gray[400],
           },
         }))
       }

package/src/components/radio/theme/Radio.carbon.theme.ts

@@ -32,7 +32,7 @@ const theme: RadioTheme = {
       return c
     },
 
-    label: 'text-sm text-gray-800 dark:text-gray-200 pl-2',
+    label: 'text-sm text-secondary-800 dark:text-secondary-200 pl-2',
 
     content: 'pl-2',
   },