Skip to content

Commit 2b81c06

Browse files
committed
fix(Tabs): fixed text font errors involving badge
1 parent b065c02 commit 2b81c06

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

packages/components/badge/README.en-US.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Name | Default Value | Description
4545
--td-badge-border-radius | 4rpx | -
4646
--td-badge-bubble-border-radius | 20rpx 20rpx 20rpx 1px | -
4747
--td-badge-content-text-color | @text-color-primary | -
48+
--td-badge-content-text-font | @font-body-large | -
4849
--td-badge-dot-size | 16rpx | -
4950
--td-badge-font | @font-mark-extraSmall | -
5051
--td-badge-large-font | @font-mark-small | -

packages/components/badge/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ t-class-count | 计数样式类
8686
--td-badge-border-radius | 4rpx | -
8787
--td-badge-bubble-border-radius | 20rpx 20rpx 20rpx 1px | -
8888
--td-badge-content-text-color | @text-color-primary | -
89+
--td-badge-content-text-font | @font-body-large | -
8990
--td-badge-dot-size | 16rpx | -
9091
--td-badge-font | @font-mark-extraSmall | -
9192
--td-badge-large-font | @font-mark-small | -

packages/components/badge/badge.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
@badge-text-color: var(--td-badge-text-color, @text-color-anti);
44
@badge-content-text-color: var(--td-badge-content-text-color, @text-color-primary);
5+
@badge-content-text-font: var(--td-badge-content-text-font, @font-body-large);
56
@badge-color: var(--td-badge-bg-color, @error-color);
67
@badge-font: var(--td-badge-font, @font-mark-extraSmall);
78
@badge-basic-height: var(--td-badge-basic-height, 32rpx);
@@ -181,7 +182,7 @@
181182

182183
&__content-text {
183184
display: block;
184-
font: @font-body-large;
185+
font: @badge-content-text-font;
185186
color: @badge-content-text-color;
186187
}
187188

packages/components/tabs/tabs.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,10 @@
161161
}
162162

163163
&__badge {
164+
--td-badge-content-text-font: @tab-font;
165+
164166
&--active {
167+
--td-badge-content-text-font: @font-mark-medium;
165168
--td-badge-content-text-color: @tab-item-active-color;
166169
}
167170

0 commit comments

Comments
 (0)