Skip to content

Commit d1424ae

Browse files
wuyiping0628zzcr
authored andcommitted
fix(tag): [tag] updata tag xdesign
1 parent d4651c6 commit d1424ae

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

examples/sites/demos/pc/app/tag/slot-default-composition-api.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<tiny-tag size="medium" :disabled="disabled" closable>
99
<tiny-icon-time class="tiny-svg-size medium" />标签
1010
</tiny-tag>
11-
<tiny-tag type="success" class="tiny-only-iocn">
12-
<icon-fileupload />
11+
<tiny-tag size="small" type="success" class="tiny-only-iocn">
12+
<tiny-icon-fileupload />
1313
</tiny-tag>
1414
</div>
1515
</template>
@@ -45,6 +45,6 @@ const TinyIconChevronRight = iconChevronRight()
4545
font-size: 20px;
4646
}
4747
.tiny-only-iocn {
48-
border-radius: 0px 8px 0px 8px;
48+
border-radius: 0px 6px;
4949
}
5050
</style>

examples/sites/demos/pc/app/tag/slot-default.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ export default {
5353
font-size: 20px;
5454
}
5555
.tiny-only-iocn {
56-
border-radius: 0px 6px 0px 6px;
56+
border-radius: 0px 6px;
5757
}
5858
</style>

packages/theme/src/tag/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
&.is-disabled:hover {
259259
cursor: not-allowed;
260260
color: #c2c2c2;
261-
background-color: rgba(0, 0, 0, 0.05);
261+
background-color: var(--ti-tag-disabled-background-color);
262262
svg,
263263
svg:hover,
264264
.@{tag-prefix-cls}__close {

packages/theme/src/tag/smb-theme.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export const tinyTagSMBTheme = {
1313
'ti-tag-border-radius': 'var(--ti-common-border-radius-2)',
1414
'ti-tag-close-font-size': 'var(--ti-common-font-size-2)',
1515
'ti-tag-close-margin-left': 'var(--ti-common-space-base)',
16+
'ti-tag-disabled-background-color': 'var(--ti-common-color-bg-disabled)',
1617
'ti-tag-close-margin-right': 'calc(var(--ti-common-space-base) * -1)',
1718
'ti-tag-close-medium-margin-left': 'var(--ti-common-space-2x)',
1819
'ti-tag-close-medium-margin-right': 'calc(var(--ti-common-space-base) * -1)',

packages/theme/src/tag/vars.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,6 @@
156156
--ti-tag-grey-text-color: var(--ti-common-color-text-gray);
157157
// grey标签背景色
158158
--ti-tag-grey-bg-color: #e6e6e6;
159+
// 禁用背景色
160+
--ti-tag-disabled-background-color: rgba(0, 0, 0, 0.05);
159161
}

0 commit comments

Comments
 (0)