Merge branch 'dev' into refactor/use-class-prop

This commit is contained in:
Sadegh Barati 2024-01-29 08:56:22 +03:30 committed by GitHub
commit 57306c2aab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@ const delegatedProps = computed(() => {
orientation === 'vertical' orientation === 'vertical'
&& 'h-full w-2.5 border-l border-l-transparent p-[1px]', && 'h-full w-2.5 border-l border-l-transparent p-[1px]',
orientation === 'horizontal' orientation === 'horizontal'
&& 'h-2.5 border-t border-t-transparent p-[1px]', && 'h-2.5 flex-col border-t border-t-transparent p-[1px]',
props.class)" props.class)"
> >
<ScrollAreaThumb class="relative flex-1 rounded-full bg-border" /> <ScrollAreaThumb class="relative flex-1 rounded-full bg-border" />

View File

@ -22,7 +22,7 @@ const delegatedProps = computed(() => {
orientation === 'vertical' orientation === 'vertical'
&& 'h-full w-2.5 border-l border-l-transparent p-[1px]', && 'h-full w-2.5 border-l border-l-transparent p-[1px]',
orientation === 'horizontal' orientation === 'horizontal'
&& 'h-2.5 border-t border-t-transparent p-[1px]', && 'h-2.5 flex-col border-t border-t-transparent p-[1px]',
props.class)" props.class)"
> >
<ScrollAreaThumb class="relative flex-1 rounded-full bg-border" /> <ScrollAreaThumb class="relative flex-1 rounded-full bg-border" />