Merge branch 'dev' into feat/encounter-status-107

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
 })
 </script>

app/components/pub/my-ui/doc-entry/field.vue

@@ -9,6 +9,6 @@ const props = defineProps({
 <template>
   <div :class="`field ${props.defaultClass} ${props.class}`">
     <slot />
-    <div v-if="props.errMessage" class="mt-1 text-xs font-medium text-red-500">{{ props.errMessage }}</div>
+    <div v-if="props.errMessage" class="mt-1 md:text-xs 2xl:text-sm font-medium text-red-500">{{ props.errMessage }}</div>
   </div>
 </template>