Skip to content

Commit fc20ab0

Browse files
authored
fix(Progress): fix style (#4153)
* fix(Progress): fix style * docs(Progress): update * fix(Progress): fixed the text padding error in the circle-type progress
1 parent 2749e1a commit fc20ab0

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

packages/components/common/style/theme/_components.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424

2525
--td-switch-dot-disabled-color: var(--td-font-white-2);
2626
--td-switch-loading-color: var(--td-font-white-1);
27+
28+
--td-progress-circle-inner-bg-color: var(--bg-color-page);
2729
}
2830
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Name | Default Value | Description
4343
--td-progress-inner-bg-color-success | @success-color | -
4444
--td-progress-inner-bg-color-warning | @warning-color | -
4545
--td-progress-circle-icon-size | 96rpx | -
46-
--td-progress-circle-inner-bg-color | @text-color-anti | -
46+
--td-progress-circle-inner-bg-color | @bg-color-container | -
4747
--td-progress-circle-label-font | @font-title-extraLarge | -
4848
--td-progress-circle-width | 224rpx | -
4949
--td-progress-inner-bg-color | @brand-color | -

packages/components/progress/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ t-class-label | 标签样式类
9595
--td-progress-inner-bg-color-success | @success-color | -
9696
--td-progress-inner-bg-color-warning | @warning-color | -
9797
--td-progress-circle-icon-size | 96rpx | -
98-
--td-progress-circle-inner-bg-color | @text-color-anti | -
98+
--td-progress-circle-inner-bg-color | @bg-color-container | -
9999
--td-progress-circle-label-font | @font-title-extraLarge | -
100100
--td-progress-circle-width | 224rpx | -
101101
--td-progress-inner-bg-color | @brand-color | -

packages/components/progress/progress.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
--td-progress-info-light-color,
3939
@text-color-anti
4040
); // 进度条浅色label字体颜色(在进度条色块内显示的色值)
41-
@progress-circle-inner-bg-color: var(--td-progress-circle-inner-bg-color, @text-color-anti); // 环境进度条内圆背景色
41+
@progress-circle-inner-bg-color: var(--td-progress-circle-inner-bg-color, @bg-color-container); // 环境进度条内圆背景色
4242

4343
@progress: ~'@{prefix}-progress';
4444

@@ -141,6 +141,7 @@
141141

142142
.@{progress}__info {
143143
margin: 0;
144+
padding: 0;
144145
font: @progress-circle-label-font;
145146
overflow: hidden;
146147
text-overflow: ellipsis;

packages/tdesign-miniprogram/example/app.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ page {
1919
--bg-color-demo-secondary: var(--td-bg-color-container);
2020
--td-navbar-bg-color: var(--td-bg-color-page);
2121
--td-navbar-color: var(--td-text-color-primary);
22-
--td-progress-circle-inner-bg-color: var(--bg-color-demo);
2322
}
2423

2524
.skyline {

0 commit comments

Comments
 (0)