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

fix(tabs): focus state color when disabled #25827

Merged
merged 1 commit into from Jul 27, 2020

Conversation

hsuanxyz
Copy link
Contributor

@hsuanxyz hsuanxyz commented Jul 27, 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
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

https://codesandbox.io/s/serene-wiles-gtu01

💡 Background and solution

屏幕录制2020-07-27 下午2 45 35 mov

📝 Changelog

Language Changelog
🇺🇸 English 🐞 Fix tab focus state color when disabled
🇨🇳 Chinese 🐞 修复 tab 禁用时 focus 状态的颜色

☑️ 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 Jul 27, 2020

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Jul 27, 2020

@codesandbox-ci
Copy link

codesandbox-ci bot commented Jul 27, 2020

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

Sandbox Source
antd reproduction template Configuration
quirky-bash-t7f14 PR

@@ -183,6 +183,14 @@
cursor: not-allowed;
Copy link
Contributor

@MrHeer MrHeer Jul 27, 2020

Choose a reason for hiding this comment

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

why not write after this line?

Copy link
Contributor Author

@hsuanxyz hsuanxyz Jul 27, 2020

Choose a reason for hiding this comment

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

sorry, I'm not familiar with less, do you have any good suggestions for me?

like this? I think the readability is not good.

  &&-disabled {
      color: @disabled-color;
      cursor: not-allowed;
      
      .@{tab-prefix-cls}-tab-btn,
      .@{tab-prefix-cls}-tab--remove {
        &:focus,
        &:active {
          color: @disabled-color;
        }
      }
    }

Copy link
Member

@xrkffgg xrkffgg Jul 27, 2020

Choose a reason for hiding this comment

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

How about pointer-events: none?

@afc163
Copy link
Member

afc163 commented Jul 27, 2020

/rebase

@codecov
Copy link

codecov bot commented Jul 27, 2020

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #25827   +/-   ##
=======================================
  Coverage   99.52%   99.52%           
=======================================
  Files         374      374           
  Lines        7300     7300           
  Branches     2037     1989   -48     
=======================================
  Hits         7265     7265           
  Misses         35       35           

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 53be0fb...e80991b. Read the comment docs.

@afc163 afc163 mentioned this pull request Jul 27, 2020
@07akioni 07akioni merged commit b34841e into ant-design:master Jul 27, 2020
25 checks passed
@hsuanxyz hsuanxyz deleted the fix/tabs-focus-color branch Jul 28, 2020
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.

None yet

6 participants