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.

Sign up for GitHub

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

Jump to bottom

style(💄): optimize Skeleton color #27836

Merged
merged 2 commits into from
Nov 18, 2020
Merged

style(💄): optimize Skeleton color #27836

merged 2 commits into from
Nov 18, 2020

Conversation

afc163
Copy link
Member

@afc163 afc163 commented Nov 17, 2020

[中文版模板 / 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

💡 Background and solution

❌ before ✅ after
image image

📝 Changelog

Language Changelog
🇺🇸 English Optimize Skeleton color to fit dark background.
🇨🇳 Chinese 优化 Skeleton 默认色彩使其能放置在暗色背景中。

☑️ 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

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Nov 17, 2020 •
edited
Loading

@afc163 afc163 force-pushed the tweak-skeleton-design branch 2 times, most recently from 7230ccb to b0dbb85 Compare November 17, 2020 11:06
@github-actions
Copy link
Contributor

github-actions bot commented Nov 17, 2020 •
edited
Loading

Size Change: +56 B (0%)

Total Size: 789 kB

Filename Size Change
./dist/antd-with-locales.min.js 312 kB -2 B (0%)
./dist/antd.compact.min.css 66.5 kB +23 B (0%)
./dist/antd.dark.min.css 67.8 kB +14 B (0%)
./dist/antd.min.css 66.5 kB +22 B (0%)
./dist/antd.min.js 276 kB -1 B

compressed-size-action

@codesandbox-ci
Copy link

codesandbox-ci bot commented Nov 17, 2020 •
edited
Loading

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 d4d28ac:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

codecov bot commented Nov 17, 2020 •
edited
Loading

Codecov Report

Merging #27836 (d4d28ac) into master (c04e510) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##            master    #27836   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          389       389           
  Lines         7349      7349           
  Branches      2091      2038   -53     
=========================================
  Hits          7349      7349

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 c04e510...d4d28ac. Read the comment docs.

@afc163
Copy link
Member Author

afc163 commented Nov 17, 2020

https://preview-27836-ant-design.surge.sh/components/skeleton-cn/?theme=dark

image

暗色主题下有点问题，background: rgba(0,0,0,0.8); 这个颜色不知道从哪来的。

@afc163
Copy link
Member Author

afc163 commented Nov 17, 2020 •
edited
Loading

呃...

https://github.com/chenshuai2144/antd-pro-merge-less/blob/deb93f66957b0474392af59bb7a6af6fa0ca7324/index.js#L38

@chenshuai2144

afc163 added a commit to afc163/antd-pro-merge-less that referenced this pull request Nov 17, 2020
@afc163
fix: remove overrided @skeleton-color
0257ff0 
ant-design/ant-design#27836 (comment)
@afc163 afc163 mentioned this pull request Nov 17, 2020
Merged
chenshuai2144 pushed a commit to chenshuai2144/antd-pro-merge-less that referenced this pull request Nov 17, 2020
@afc163
fix: remove overrided @skeleton-color (#23)
12e68d2 
ant-design/ant-design#27836 (comment)
@afc163
Copy link
Member Author

afc163 commented Nov 18, 2020

/rebase

@github-actions github-actions bot force-pushed the tweak-skeleton-design branch from b0dbb85 to 8f9e2d5 Compare November 18, 2020 04:05
@afc163
Copy link
Member Author

afc163 commented Nov 18, 2020

见鬼了，这个 rgba(0,0,0,0.8) 还在。

@xrkffgg
Copy link
Member

xrkffgg commented Nov 18, 2020

确实见鬼了。。。。

@xrkffgg
Copy link
Member

xrkffgg commented Nov 18, 2020

https://github.com/ant-design/ant-design-dark-theme/blob/1671d6d6bb0563a1acde31b4b0bffbfc9783b39d/index.ts#L45

也许因为这个

@xrkffgg
Copy link
Member

xrkffgg commented Nov 18, 2020

antd-pro-merge-less 引的

"@ant-design/dark-theme": "^2.0.2",

@afc163
Copy link
Member Author

afc163 commented Nov 18, 2020

发现了，@ant-design/dark-theme 和 antd-pro-merge-less 里面挺乱的，我试着去掉这俩。

@afc163
Copy link
Member Author

afc163 commented Nov 18, 2020

先合并，代码本身没问题，theme 生成的问题我另起 PR。

@afc163 afc163 merged commit 6836414 into master Nov 18, 2020
@afc163 afc163 deleted the tweak-skeleton-design branch November 18, 2020 10:07
@dengfuping dengfuping mentioned this pull request Nov 22, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@afc163 @ant-design-bot @xrkffgg