From 82c73713aff458c94efe4e5c8ada690ab1e5c879 Mon Sep 17 00:00:00 2001 From: ElanYoung <991658923@qq.com> Date: Sat, 12 Aug 2023 16:49:45 +0800 Subject: [PATCH 1/3] feat(loading): add css variable for text color BREAKING CHANGE: q --- src/loading/README.en-US.md | 1 + src/loading/README.md | 1 + src/loading/loading.less | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/loading/README.en-US.md b/src/loading/README.en-US.md index 1af7609f7..ec4838b34 100644 --- a/src/loading/README.en-US.md +++ b/src/loading/README.en-US.md @@ -25,5 +25,6 @@ The component provides the following CSS variables, which can be used to customi Name | Default Value | Description -- | -- | -- --td-loading-color | @brand-color | - +--td-loading-text-color | @font-gray-1 | - --td-loading-text-font-size | 24rpx | - --td-loading-text-line-height | 40rpx | - diff --git a/src/loading/README.md b/src/loading/README.md index 037b52166..e0464173c 100644 --- a/src/loading/README.md +++ b/src/loading/README.md @@ -80,5 +80,6 @@ t-class-indicator | 指示符样式类 名称 | 默认值 | 描述 -- | -- | -- --td-loading-color | @brand-color | - +--td-loading-text-color | @font-gray-1 | - --td-loading-text-font-size | 24rpx | - --td-loading-text-line-height | 40rpx | - diff --git a/src/loading/loading.less b/src/loading/loading.less index eeb5429c7..5154c0402 100644 --- a/src/loading/loading.less +++ b/src/loading/loading.less @@ -3,6 +3,7 @@ @loading: ~'@{prefix}-loading'; @loading-color: var(--td-loading-color, @brand-color); +@loading-text-color: var(--td-loading-text-color, @font-gray-1); @loading-text-font-size: var(--td-loading-text-font-size, 24rpx); @loading-text-line-height: var(--td-loading-text-line-height, 40rpx); @@ -89,6 +90,7 @@ } &__text { + color: @loading-text-color; font-size: @loading-text-font-size; line-height: @loading-text-line-height; From 0a11853a958a06722a441d987ed0d0f3afd47e5f Mon Sep 17 00:00:00 2001 From: ElanYoung <991658923@qq.com> Date: Tue, 15 Aug 2023 20:17:42 +0800 Subject: [PATCH 2/3] fix(loading): update text color --- src/loading/loading.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/loading/loading.less b/src/loading/loading.less index 5154c0402..3ca6f0809 100644 --- a/src/loading/loading.less +++ b/src/loading/loading.less @@ -3,7 +3,7 @@ @loading: ~'@{prefix}-loading'; @loading-color: var(--td-loading-color, @brand-color); -@loading-text-color: var(--td-loading-text-color, @font-gray-1); +@loading-text-color: var(--td-loading-text-color, inherit); @loading-text-font-size: var(--td-loading-text-font-size, 24rpx); @loading-text-line-height: var(--td-loading-text-line-height, 40rpx); From daa7121858d3c12e1ccc6fc4296c77b4d7978950 Mon Sep 17 00:00:00 2001 From: ElanYoung <991658923@qq.com> Date: Tue, 15 Aug 2023 20:17:52 +0800 Subject: [PATCH 3/3] docs(loading): update css variables --- src/loading/README.en-US.md | 2 +- src/loading/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/loading/README.en-US.md b/src/loading/README.en-US.md index ec4838b34..c2414ba34 100644 --- a/src/loading/README.en-US.md +++ b/src/loading/README.en-US.md @@ -25,6 +25,6 @@ The component provides the following CSS variables, which can be used to customi Name | Default Value | Description -- | -- | -- --td-loading-color | @brand-color | - ---td-loading-text-color | @font-gray-1 | - +--td-loading-text-color | inherit | - --td-loading-text-font-size | 24rpx | - --td-loading-text-line-height | 40rpx | - diff --git a/src/loading/README.md b/src/loading/README.md index e0464173c..18ee4c87a 100644 --- a/src/loading/README.md +++ b/src/loading/README.md @@ -80,6 +80,6 @@ t-class-indicator | 指示符样式类 名称 | 默认值 | 描述 -- | -- | -- --td-loading-color | @brand-color | - ---td-loading-text-color | @font-gray-1 | - +--td-loading-text-color | inherit | - --td-loading-text-font-size | 24rpx | - --td-loading-text-line-height | 40rpx | -