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: List bordered and split props conflict #21784

Merged
merged 1 commit into from Mar 2, 2020

Conversation

MXWXZ
Copy link
Contributor

@MXWXZ MXWXZ commented Mar 2, 2020

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

When List props split=true it already has .ant-list-split class that add the split line, while bordered=true will add .ant-list-bordered .ant-list-item that add the split line too.

So when split=false and bordered=true, the split line will still exist.

Solution: remove the split line in .ant-list-bordered .ant-list-item.
sandbox

📝 Changelog

Language Changelog
🇺🇸 English List bordered and split props conflict
🇨🇳 Chinese List组件bordered和split属性冲突

☑️ Self Check before Merge

  • 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 ant-design-bot commented Mar 2, 2020

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Mar 2, 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 f41db18:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

@codecov codecov bot commented Mar 2, 2020

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #21784   +/-   ##
=======================================
  Coverage   97.88%   97.88%           
=======================================
  Files         305      305           
  Lines        6999     6999           
  Branches     1884     1884           
=======================================
  Hits         6851     6851           
  Misses        148      148

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 9eaaea1...f41db18. Read the comment docs.

@afc163 afc163 merged commit bd747c9 into ant-design:master Mar 2, 2020
20 checks passed
@pr-triage pr-triage bot added the PR: merged label Mar 2, 2020
@zombieJ zombieJ mentioned this pull request Mar 4, 2020
10 tasks
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

3 participants