Browse Source

fix(style): 1.修复ToggleGroupItem边框样式问题 2.修复用户头像下拉框Badge背景颜色

pull/8033/head
hiss 4 months ago
parent
commit
5c9daab2ff
  1. 2
      packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/ToggleGroupItem.vue
  2. 6
      packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue

2
packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/ToggleGroupItem.vue

@ -46,7 +46,7 @@ const forwardedProps = useForwardProps(delegatedProps);
size: context?.size || size, size: context?.size || size,
}), }),
'w-auto min-w-0 shrink-0 px-3 focus:z-10 focus-visible:z-10', 'w-auto min-w-0 shrink-0 px-3 focus:z-10 focus-visible:z-10',
'data-[spacing=0]:rounded-none data-[spacing=0]:shadow-none data-[spacing=0]:first:rounded-l-md data-[spacing=0]:last:rounded-r-md data-[spacing=0]:data-[variant=outline]:border-l-0 data-[spacing=0]:data-[variant=outline]:first:border-l', 'data-[spacing=0]:rounded-none data-[spacing=0]:shadow-none data-[spacing=0]:first:rounded-l-md data-[spacing=0]:last:rounded-r-md data-[variant=outline]:[&:not(:first-child)]:-ml-px data-[spacing=0]:data-[variant=outline]:first:border-l',
props.class, props.class,
) )
" "

6
packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue

@ -237,7 +237,11 @@ if (enableShortcutKey.value) {
> >
{{ text }} {{ text }}
<slot name="tagText"> <slot name="tagText">
<Badge v-if="tagText" class="ml-2 text-green-400"> <Badge
v-if="tagText"
variant="secondary"
class="ml-2 text-green-400"
>
{{ tagText }} {{ tagText }}
</Badge> </Badge>
</slot> </slot>

Loading…
Cancel
Save