Skip to content

Commit

Permalink
fix(tag): [tag] updata tag xdesign
Browse files Browse the repository at this point in the history
  • Loading branch information
wuyiping0628 authored and zzcr committed Sep 9, 2024
1 parent d4651c6 commit d1424ae
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<tiny-tag size="medium" :disabled="disabled" closable>
<tiny-icon-time class="tiny-svg-size medium" />标签
</tiny-tag>
<tiny-tag type="success" class="tiny-only-iocn">
<icon-fileupload />
<tiny-tag size="small" type="success" class="tiny-only-iocn">
<tiny-icon-fileupload />
</tiny-tag>
</div>
</template>
Expand Down Expand Up @@ -45,6 +45,6 @@ const TinyIconChevronRight = iconChevronRight()
font-size: 20px;
}
.tiny-only-iocn {
border-radius: 0px 8px 0px 8px;
border-radius: 0px 6px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/tag/slot-default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ export default {
font-size: 20px;
}
.tiny-only-iocn {
border-radius: 0px 6px 0px 6px;
border-radius: 0px 6px;
}
</style>
2 changes: 1 addition & 1 deletion packages/theme/src/tag/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
&.is-disabled:hover {
cursor: not-allowed;
color: #c2c2c2;
background-color: rgba(0, 0, 0, 0.05);
background-color: var(--ti-tag-disabled-background-color);
svg,
svg:hover,
.@{tag-prefix-cls}__close {
Expand Down
1 change: 1 addition & 0 deletions packages/theme/src/tag/smb-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const tinyTagSMBTheme = {
'ti-tag-border-radius': 'var(--ti-common-border-radius-2)',
'ti-tag-close-font-size': 'var(--ti-common-font-size-2)',
'ti-tag-close-margin-left': 'var(--ti-common-space-base)',
'ti-tag-disabled-background-color': 'var(--ti-common-color-bg-disabled)',
'ti-tag-close-margin-right': 'calc(var(--ti-common-space-base) * -1)',
'ti-tag-close-medium-margin-left': 'var(--ti-common-space-2x)',
'ti-tag-close-medium-margin-right': 'calc(var(--ti-common-space-base) * -1)',
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/src/tag/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,6 @@
--ti-tag-grey-text-color: var(--ti-common-color-text-gray);
// grey标签背景色
--ti-tag-grey-bg-color: #e6e6e6;
// 禁用背景色
--ti-tag-disabled-background-color: rgba(0, 0, 0, 0.05);
}

0 comments on commit d1424ae

Please sign in to comment.