Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: add @progress-info-text-color #28981

Merged
merged 4 commits into from
Feb 2, 2021
Merged

Conversation

yuxuan
Copy link
Contributor

@yuxuan yuxuan commented Jan 22, 2021

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

fix #28980

💡 Background and solution

Fix issue: #28980

📝 Changelog

Language Changelog
🇺🇸 English
🇨🇳 Chinese 新增 @progress-info-text-color

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

Not sure this change is appropriate. The Progress text color changed from @text-secondary-color to @text-color, which may cause visual difference.

@xrkffgg xrkffgg changed the title fix(Progress): progress text color uses @progress-text-color style(Progress): progress text color uses @progress-text-color Jan 22, 2021
@xrkffgg xrkffgg changed the title style(Progress): progress text color uses @progress-text-color fix(Progress): progress text color uses @progress-text-color Jan 22, 2021
@ant-design-bot
Copy link
Contributor

ant-design-bot commented Jan 22, 2021

@@ -93,7 +93,7 @@
display: inline-block;
width: 2em;
margin-left: 8px;
color: @text-color-secondary;
color: @progress-text-color;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

把 style 里的 改成这个

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个在circle里面用到了,是@text-color,两个互斥

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

那换个名字

@codesandbox-ci
Copy link

codesandbox-ci bot commented Jan 22, 2021

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit c13b9fa:

Sandbox Source
antd reproduction template Configuration

@github-actions
Copy link
Contributor

github-actions bot commented Jan 22, 2021

Size Change: +2.33 kB (0%)

Total Size: 791 kB

Filename Size Change
./dist/antd-with-locales.min.js 313 kB +620 B (0%)
./dist/antd.compact.min.css 67.3 kB +359 B (+1%)
./dist/antd.dark.min.css 68.6 kB +359 B (+1%)
./dist/antd.min.css 67.3 kB +366 B (+1%)
./dist/antd.min.js 275 kB +626 B (0%)

compressed-size-action

@codecov
Copy link

codecov bot commented Jan 22, 2021

Codecov Report

Merging #28981 (c13b9fa) into master (7f50e3f) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##            master    #28981   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          393       394    +1     
  Lines         7450      7485   +35     
  Branches      2149      2141    -8     
=========================================
+ Hits          7450      7485   +35     
Impacted Files Coverage Δ
components/grid/col.tsx 100.00% <0.00%> (ø)
components/grid/row.tsx 100.00% <0.00%> (ø)
components/badge/index.tsx 100.00% <0.00%> (ø)
components/modal/Modal.tsx 100.00% <0.00%> (ø)
components/table/Table.tsx 100.00% <0.00%> (ø)
components/modal/confirm.tsx 100.00% <0.00%> (ø)
components/input/TextArea.tsx 100.00% <0.00%> (ø)
components/typography/Base.tsx 100.00% <0.00%> (ø)
components/typography/Text.tsx 100.00% <0.00%> (ø)
components/page-header/index.tsx 100.00% <0.00%> (ø)
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f50e3f...c13b9fa. Read the comment docs.

@@ -163,7 +163,7 @@
width: 100%;
margin: 0;
padding: 0;
color: @progress-text-color;
color: @progress-circle-text-color;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

原有的不动,上面的新增个。不然会造成破坏性更新的。

@xrkffgg
Copy link
Member

xrkffgg commented Jan 30, 2021

QAQ

@xrkffgg xrkffgg requested a review from afc163 January 31, 2021 12:43
@xrkffgg xrkffgg changed the title fix(Progress): progress text color uses @progress-text-color style: add @progress-info-text-color Feb 1, 2021
Co-authored-by: afc163 <afc163@gmail.com>
@chenshuai2144 chenshuai2144 merged commit dce3ce7 into ant-design:master Feb 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Progress text color is inconsistent with Progress circle text color
5 participants