Skip to content

Commit 6894b55

Browse files
authored
fix(countup): 分隔符文字颜色支持css变量修改 (#2871)
* fix: 解决微信小程序滚动报错问题 * fix(countup): 分隔符文字颜色支持css变量修改
1 parent e7b36cf commit 6894b55

File tree

8 files changed

+11
-1
lines changed

8 files changed

+11
-1
lines changed

src/packages/animatingnumbers/countup.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
display: flex;
2525
height: 80%;
2626
align-items: flex-end;
27-
color: $countup-bg-color;
27+
color: $countup-separator-color;
2828
font-size: $countup-base-size;
2929
font-weight: $font-weight-bold;
3030
}

src/packages/animatingnumbers/demos/h5/demo2.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const Demo2 = () => {
77
nutuiCountupBgColor: `var(--nutui-color-primary)`,
88
nutuiCountupColor: `#fff`,
99
nutuiCountupLrMargin: `1px`,
10+
nutuiCountupSeparatorColor: `var(--nutui-color-primary)`,
1011
}
1112
const [value, setEndNumer] = useState('1570.99')
1213
useEffect(() => {

src/packages/animatingnumbers/demos/taro/demo2.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const Demo2 = () => {
77
nutuiCountupBgColor: `var(--nutui-color-primary)`,
88
nutuiCountupColor: `#fff`,
99
nutuiCountupLrMargin: `1px`,
10+
nutuiCountupSeparatorColor: `var(--nutui-color-primary)`,
1011
}
1112
const [value, setEndNumer] = useState('1570.99')
1213
useEffect(() => {

src/packages/animatingnumbers/doc.en-US.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ The component provides the following CSS variables, which can be used to customi
5353
| \--nutui-countup-lr-margin | margin of item | `0` |
5454
| \--nutui-countup-bg-color | background color of item | `inherit` |
5555
| \--nutui-countup-color | color of item | `$color-title` |
56+
| \--nutui-countup-separator-color | The font color of the separator | `$color-title` |

src/packages/animatingnumbers/doc.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ import { AnimatingNumbers } from '@nutui/nutui-react'
5353
| \--nutui-countup-lr-margin | 每个数字的margin | `0` |
5454
| \--nutui-countup-bg-color | 每个数字块的背景色 | `inherit` |
5555
| \--nutui-countup-color | 每个数字块的字色 | `$color-title` |
56+
| \--nutui-countup-separator-color | 分隔符的字体颜色 | `$color-title` |

src/packages/animatingnumbers/doc.taro.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ import { AnimatingNumbers } from '@nutui/nutui-react-taro'
5353
| \--nutui-countup-lr-margin | 每个数字的margin | `0` |
5454
| \--nutui-countup-bg-color | 每个数字块的背景色 | `inherit` |
5555
| \--nutui-countup-color | 每个数字块的字色 | `$color-title` |
56+
| \--nutui-countup-separator-color | 分隔符的字体颜色 | `$color-title` |

src/packages/animatingnumbers/doc.zh-TW.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ import { AnimatingNumbers } from '@nutui/nutui-react'
5353
| \--nutui-countup-lr-margin | 每個數字的margin | `0` |
5454
| \--nutui-countup-bg-color | 每個數字塊的背景色 | `inherit` |
5555
| \--nutui-countup-color | 每個數字塊的字色 | `$color-title` |
56+
| \--nutui-countup-separator-color | 分隔符的字體顏色 | `$color-title` |

src/styles/variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2423,6 +2423,10 @@ $countup-border-radius: var(--nutui-countup-border-radius, 4px) !default;
24232423
$countup-lr-margin: var(--nutui-countup-lr-margin, 0) !default;
24242424
$countup-bg-color: var(--nutui-countup-bg-color, inherit) !default;
24252425
$countup-color: var(--nutui-countup-color, $color-title) !default;
2426+
$countup-separator-color: var(
2427+
--nutui-countup-separator-color,
2428+
$color-title
2429+
) !default;
24262430

24272431
// layout(✅)
24282432
$row-content-color: var(--nutui-row-content-color, #fff) !default;

0 commit comments

Comments
 (0)