Skip to content

Commit aa1308d

Browse files
authored
fix(Slider): fix disabled style error (#2814)
1 parent f489baf commit aa1308d

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed

src/common/style/theme/_components.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66
page {
77
--td-button-primary-disabled-color: var(--td-font-white-4);
88
--td-skeleton-animation-gradient: rgba(255, 255, 255, 6%);
9+
--td-slider-dot-bg-color: var(--td-gray-color-4);
10+
--td-slider-dot-disabled-bg-color: var(--td-gray-color-11);
11+
--td-slider-dot-disabled-border-color: var(--td-gray-color-12);
912
}
1013
}

src/slider/README.en-US.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,18 @@ Name | Default Value | Description
3535
-- | -- | --
3636
--td-slider-active-color | @brand-color | -
3737
--td-slider-bar-height | 8rpx | -
38+
--td-slider-bar-width | 8rpx | -
3839
--td-slider-capsule-bar-color | @bg-color-component | -
3940
--td-slider-capsule-bar-heihgt | 48rpx | -
41+
--td-slider-capsule-bar-width | 48rpx | -
4042
--td-slider-capsule-line-heihgt | 36rpx | -
43+
--td-slider-default-color | @bg-color-component | -
4144
--td-slider-default-color | @bg-color-component-disabled | -
42-
--td-slider-default-color | @bg-color-secondarycomponent | -
4345
--td-slider-disabled-color | @brand-color-disabled | -
44-
--td-slider-disabled-text-color | @font-gray-4 | -
45-
--td-slider-dot-bg-color | @bg-color-container | -
46-
--td-slider-dot-color | @bg-color-secondarycontainer | -
46+
--td-slider-disabled-text-color | @text-color-disabled | -
47+
--td-slider-dot-bg-color | #fff | -
48+
--td-slider-dot-color | @component-border | -
49+
--td-slider-dot-disabled-bg-color | #fff | -
50+
--td-slider-dot-disabled-color | #f3f3f3 | -
4751
--td-slider-dot-size | 40rpx | -
52+
--td-slider-text-color | @text-color-primary | -

src/slider/README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,19 @@ $slider.init();
113113
名称 | 默认值 | 描述
114114
-- | -- | --
115115
--td-slider-active-color | @brand-color | -
116-
--td-slider-bar-height | 8rpx | vertical为true时默认为400rpx
117-
--td-slider-bar-width | 8rpx | vertical为true时有效
116+
--td-slider-bar-height | 8rpx | vertical为true时默认为400rpx
117+
--td-slider-bar-width | 8rpx | vertical为true时有效
118118
--td-slider-capsule-bar-color | @bg-color-component | -
119119
--td-slider-capsule-bar-heihgt | 48rpx | -
120-
--td-slider-capsule-bar-width | 48rpx | vertical为true时有效
120+
--td-slider-capsule-bar-width | 48rpx | vertical为true时有效
121121
--td-slider-capsule-line-heihgt | 36rpx | -
122+
--td-slider-default-color | @bg-color-component | -
122123
--td-slider-default-color | @bg-color-component-disabled | -
123-
--td-slider-default-color | @bg-color-secondarycomponent | -
124124
--td-slider-disabled-color | @brand-color-disabled | -
125-
--td-slider-disabled-text-color | @font-gray-4 | -
126-
--td-slider-dot-bg-color | @bg-color-container | -
127-
--td-slider-dot-color | @bg-color-secondarycontainer | -
125+
--td-slider-disabled-text-color | @text-color-disabled | -
126+
--td-slider-dot-bg-color | #fff | -
127+
--td-slider-dot-color | @component-border | -
128+
--td-slider-dot-disabled-bg-color | #fff | -
129+
--td-slider-dot-disabled-color | #f3f3f3 | -
128130
--td-slider-dot-size | 40rpx | -
131+
--td-slider-text-color | @text-color-primary | -

src/slider/slider.less

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
@slider-bar-width: var(--td-slider-bar-width, 8rpx);
66
@slider-bar-height: var(--td-slider-bar-height, 8rpx);
77
@slider-dot-bg-color: var(--td-slider-dot-bg-color, #fff);
8+
@slider-dot-disabled-bg-color: var(--td-slider-dot-disabled-bg-color, #fff);
89
@slider-dot-size: var(--td-slider-dot-size, 40rpx);
9-
@slider-dot-color: var(--td-slider-dot-color, @component-border);
10+
@slider-dot-border-color: var(--td-slider-dot-color, @component-border);
11+
@slider-dot-disabled-border-color: var(--td-slider-dot-disabled-border-color, #f3f3f3);
1012
@slider-default-color: var(--td-slider-default-color, @bg-color-component);
1113
@slider-default-disabled-color: var(--td-slider-default-color, @bg-color-component-disabled);
1214
@slider-active-color: var(--td-slider-active-color, @brand-color);
@@ -32,6 +34,11 @@
3234
.@{slider}__scale-desc {
3335
color: @slider-disabled-text-color;
3436
}
37+
38+
.@{slider}__dot {
39+
background-color: @slider-dot-disabled-bg-color;
40+
border-color: @slider-dot-disabled-border-color;
41+
}
3542
}
3643

3744
&--top {
@@ -61,7 +68,7 @@
6168

6269
&__dot {
6370
border-radius: 50%;
64-
border: 2rpx solid @slider-dot-color;
71+
border: 2rpx solid @slider-dot-border-color;
6572
position: absolute;
6673
top: 50%;
6774
right: 0;

0 commit comments

Comments
 (0)