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

new style of danger button #5815

Merged
merged 2 commits into from
Apr 22, 2017
Merged

Conversation

ddcat1115
Copy link
Contributor

2017-04-19 5 19 34

@mention-bot
Copy link

@ddcat1115, thanks for your PR! By analyzing the history of the files in this pull request, we identified @afc163, @simaQ and @benjycui to be potential reviewers.

@codecov
Copy link

codecov bot commented Apr 19, 2017

Codecov Report

Merging #5815 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5815   +/-   ##
=======================================
  Coverage   86.82%   86.82%           
=======================================
  Files         183      183           
  Lines        4560     4560           
  Branches     1323     1323           
=======================================
  Hits         3959     3959           
  Misses        601      601

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 0a2fb18...d4875f2. Read the comment docs.

@btn-danger-bg : @background-color-base;
@btn-danger-border : @border-color-base;
@btn-danger-hover-color: #fff;
@btn-danger-active-bg : @red-7;
Copy link
Member

Choose a reason for hiding this comment

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

感觉不需要这么多变量,后两个可以去掉。

@@ -108,8 +108,9 @@
@btn-default-bg : #fff;
@btn-default-border : @border-color-base;

@btn-danger-color : #fff;
@btn-danger-bg : @red-6;
@btn-danger-color : @red-6;
Copy link
Contributor

@kappa-gooner kappa-gooner Apr 20, 2017

Choose a reason for hiding this comment

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

I've a suggestion here (Which I would've raised as a separate PR if I hadn't seen this one).
Can you assign this variable to @error-color?
https://github.com/ant-design/ant-design/blob/master/components/style/themes/default.less#L17

That way you only need to override error-color to get the desired color on the danger button.
Makes sense? @afc163 @benjycui

Copy link
Member

Choose a reason for hiding this comment

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

Yes, you are right. @ddcat1115

Copy link
Member

Choose a reason for hiding this comment

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

Yes, you are right. @ddcat1115

@ddcat1115 ddcat1115 merged commit 75e9e44 into ant-design:master Apr 22, 2017
@lock
Copy link

lock bot commented May 1, 2018

This thread has been automatically locked because it has not had recent activity. Please open a new issue for related bugs and link to relevant comments in this thread.

@lock lock bot locked and limited conversation to collaborators May 1, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants