munawwirul_jamal/simrsx-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: solve conflict at material entry

Browse Source
This commit is contained in:
riefive
2025-09-08 10:30:26 +07:00
parent abd98336c1 2b41d5f163
commit 354ed82df1
125 changed files with 4986 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/pub/ui/select/SelectTrigger.vue
+3 -3
View File
@@ -21,14 +21,14 @@ const iconName = computed(() => props.iconName || 'i-radix-icons-caret-sort')
v-bind="forwardedProps"
:class="
cn(
'border-input ring-offset-background placeholder:text-muted-foreground flex h-10 w-full rounded-md border border-gray-400 px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',
'border-input ring-offset-background placeholder:text-muted-foreground relative flex h-10 w-full rounded-md border border-gray-400 pl-3 pr-8 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50',
props.class,
)
"
>
<slot />
<SelectIcon as-child>
<Icon :name="iconName" class="h-4 w-4 opacity-50" />
<SelectIcon as-child class="absolute right-3 top-1/2 -translate-y-1/2">
<Icon name="i-radix-icons-caret-sort" class="h-4 w-4 opacity-50" />
</SelectIcon>
</SelectTrigger>
</template>