diff --git a/app/components/pub/my-ui/doc-entry/block.vue b/app/components/pub/my-ui/doc-entry/block.vue index d56d568b..cda58280 100644 --- a/app/components/pub/my-ui/doc-entry/block.vue +++ b/app/components/pub/my-ui/doc-entry/block.vue @@ -63,8 +63,8 @@ const settingClass = computed(() => { cls += ' [&_.label]:pb-1 '; } cls += ' [&:not(.preview)_.height-default]:pt-2 [&:not(.preview)_.height-default]:2xl:!pt-1.5 [&:not(.preview)_.height-compact]:!pt-1 ' - cls += '[&_textarea]:text-xs [&_textarea]:xl:text-sm ' - cls += '[&_label]:text-xs [&_label]:xl:text-sm' + cls += '[&_textarea]:text-xs [&_textarea]:2xl:!text-sm ' + cls += '[&_label]:text-xs [&_label]:2xl:!text-sm' return cls }) diff --git a/app/components/pub/my-ui/doc-entry/field.vue b/app/components/pub/my-ui/doc-entry/field.vue index fb43507a..42818744 100644 --- a/app/components/pub/my-ui/doc-entry/field.vue +++ b/app/components/pub/my-ui/doc-entry/field.vue @@ -9,6 +9,6 @@ const props = defineProps({ diff --git a/app/components/pub/ui/button/index.ts b/app/components/pub/ui/button/index.ts index c16fb713..c1aa89a8 100644 --- a/app/components/pub/ui/button/index.ts +++ b/app/components/pub/ui/button/index.ts @@ -4,7 +4,7 @@ import { cva } from 'class-variance-authority' export { default as Button } from './Button.vue' export const buttonVariants = cva( - 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md md:tex-xs xl:text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring 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 md:text-xs 2xl:text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', { variants: { variant: { @@ -19,7 +19,7 @@ export const buttonVariants = cva( link: 'text-primary underline-offset-4 hover:underline', }, size: { - default: 'md:h8 xl:h-9 px-4 py-2', + default: 'md:h8 2xl:h-9 px-4 py-2', xs: 'h-7 rounded px-2', sm: 'h-8 rounded-md px-3 text-xs', lg: 'h-10 rounded-md px-8', diff --git a/app/components/pub/ui/checkbox/Checkbox.vue b/app/components/pub/ui/checkbox/Checkbox.vue index f8b25c7a..1e01933d 100644 --- a/app/components/pub/ui/checkbox/Checkbox.vue +++ b/app/components/pub/ui/checkbox/Checkbox.vue @@ -21,7 +21,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) diff --git a/app/components/pub/ui/form/FormDescription.vue b/app/components/pub/ui/form/FormDescription.vue index 60bc8767..b8508491 100644 --- a/app/components/pub/ui/form/FormDescription.vue +++ b/app/components/pub/ui/form/FormDescription.vue @@ -14,7 +14,7 @@ const { formDescriptionId } = useFormField()