Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ant tag icon default style #5473

Merged
merged 1 commit into from
Feb 4, 2025
+25 −4
Merged

fix: ant tag icon default style #5473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions packages/styles/src/antd/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,25 @@
}

/* * 修复按钮添加图标时的位置问题 */
svg {
> svg {
display: inline-block;
}

svg + span {
> svg + span {
margin-inline-start: 6px;
}
}

.ant-tag {
> svg {
display: inline-block;
}

> svg + span {
margin-inline-start: 4px;
}
}

.ant-message-notice-content,
.ant-notification-notice {
@apply dark:border-border/60 dark:border;
Expand Down
15 changes: 13 additions & 2 deletions playground/src/views/examples/tippy/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import type { TippyProps } from '@vben/common-ui';
import { reactive } from 'vue';

import { Page, Tippy } from '@vben/common-ui';
import { ChevronDown } from '@vben/icons';

import { Button, Card, Flex } from 'ant-design-vue';
import { Button, Card, Flex, Tag } from 'ant-design-vue';

import { useVbenForm } from '#/adapter/form';

Expand Down Expand Up @@ -254,7 +255,7 @@ function goDoc() {
<p class="mb-4">
指令形式使用比较简洁，直接在需要展示tooltip的组件上用v-tippy传递配置，适用于固定内容的工具提示。
</p>
<Flex warp="warp" gap="20">
<Flex warp="warp" gap="20" align="center">
<Button v-tippy="'这是一个提示，使用了默认的配置'">默认配置</Button>

<Button
Expand All @@ -277,8 +278,18 @@ function goDoc() {
animation: 'scale',
}"
>
<template #icon>
<ChevronDown class="size-4" />
</template>
指定动画
</Button>
<Tag color="#f50">
<template #icon>
<ChevronDown class="size-4" />
</template>

默认配置
</Tag>
</Flex>
</Card>
<Card title="组件形式使用" class="mt-4">
Expand Down