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: ButtonGroup style bug when have disabled button #9296 #11321

Merged
merged 2 commits into from Jul 21, 2018

Conversation

Projects
None yet
4 participants
@tangjinzhou
Contributor

tangjinzhou commented Jul 18, 2018

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

  • Make sure that you propose PR to right branch: bugfix for master, feature for latest active branch feature-x.x.
  • Make sure that you follow antd's code convention.
  • Run npm run lint and fix those errors before submitting in order to keep consistent code style.
  • Rebase before creating a PR to keep commit history clear.
  • Add some descriptions and refer relative issues for you PR.

Extra checklist:

if isBugFix :

  • Make sure that you add at least one unit test for the bug which you had fixed.

elif isNewFeature :

  • Update API docs for the component.
  • Update/Add demo to demonstrate new feature.
  • Update TypeScript definition for the component.
  • Add unit tests for the feature.

https://codesandbox.io/s/61lqr2m4mr
image

border-radius: 0;
}

> .@{btnClassName}:first-child,
> span:first-child > .@{btnClassName} {
margin-left: 0;
}
> .@{btnClassName}:first-child:last-child {

This comment has been minimized.

@afc163

afc163 Jul 18, 2018

Member

:only:child

This comment has been minimized.

@tangjinzhou

tangjinzhou Jul 18, 2018

Contributor

👍 :only-child

@tangjinzhou

This comment has been minimized.

Contributor

tangjinzhou commented Jul 18, 2018

@ant-design-bot

This comment has been minimized.

ant-design-bot commented Jul 18, 2018

Deploy preview for ant-design ready!

Built with commit 00c8808

https://deploy-preview-11321--ant-design.netlify.com

@codecov

This comment has been minimized.

codecov bot commented Jul 18, 2018

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #11321   +/-   ##
=======================================
  Coverage   91.76%   91.76%           
=======================================
  Files         199      199           
  Lines        5005     5005           
  Branches     1402     1402           
=======================================
  Hits         4593     4593           
  Misses        407      407           
  Partials        5        5

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 fc7c64c...00c8808. Read the comment docs.

@zombieJ zombieJ merged commit 430381f into ant-design:master Jul 21, 2018

6 checks passed

WIP ready for review
Details
codecov/patch Coverage not affected when comparing fc7c64c...00c8808
Details
codecov/project 91.76% remains the same compared to fc7c64c
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
security/snyk - package.json (paranoidjk) No manifest changes detected
@zombieJ

This comment has been minimized.

Member

zombieJ commented Jul 21, 2018

Thanks for contribution, merge into master

bors bot added a commit to mozilla/delivery-console that referenced this pull request Jul 23, 2018

Merge #317
317: Update dependency antd to v3.7.1 r=magopian a=renovate[bot]

This Pull Request updates dependency [antd](https://github.com/ant-design/ant-design) from `v3.7.0` to `v3.7.1`



<details>
<summary>Release Notes</summary>

### [3.7.1](https://github.com/ant-design/ant-design/releases/3.7.1)
[Compare Source](ant-design/ant-design@3.7.0...3.7.1)
- 🐞 Fix popup content can't display in Drawer component.[#&#8203;11304](`ant-design/ant-design#11304)
- 🐞 Card using `tabList` support `disabled` prop.[#&#8203;11212](`ant-design/ant-design#11212)
- 🐞 Fix Link of Anchor not sync when `href` update.[#&#8203;11287](`ant-design/ant-design#11287) [@&#8203;tangjinzhou]
- 🐞 Fix Menu component style.[#&#8203;11299](`ant-design/ant-design#11299)
- 🐞 Fix Drawer component don't have animation when `destroyOnClose` is set.[#&#8203;11307](`ant-design/ant-design#11307)
- 🐞 Fix DirectoryTree can't expand when `expandedKeys` is in control.[#&#8203;11366](`ant-design/ant-design#11366)
- 🐞 Fix Button with Tooltip under ButtonGroup style issue when Button is `disabled`.[11321](`ant-design/ant-design#11321) [@&#8203;tangjinzhou]


---


- 🐞 修复 Drawer 内无法显示弹层组件的问题。[#&#8203;11304](`ant-design/ant-design#11304)
- 🐞 带页签的卡片页签支持 disabled 属性。[#&#8203;11212](`ant-design/ant-design#11212)
- 🐞 修复锚点链接组件 href 改变不更新的问题。 [#&#8203;11287](`ant-design/ant-design#11287) [@&#8203;tangjinzhou]
- 🐞 修复 Menu 样式细节问题。[#&#8203;11299](`ant-design/ant-design#11299)
- 🐞 修复 Drawer 组件设置 `destroyOnClose` 后关闭动画消失。[#&#8203;11307](`ant-design/ant-design#11307)
- 🐞 修复 DirectoryTree 在 `expandedKeys` 属性可控时点击无法展开的问题。[#&#8203;11366](`ant-design/ant-design#11366)
- 🐞 修复 ButtonGroup 中使用 Tooltip 的 Button 在 `disabled` 时样式不正确的问题。[11321](`ant-design/ant-design#11321) [@&#8203;tangjinzhou]

---

</details>




---

This PR has been generated by [Renovate Bot](https://renovatebot.com).

Co-authored-by: Renovate Bot <bot@renovateapp.com>

@tangjinzhou tangjinzhou deleted the tangjinzhou:buttonGroup branch Jul 27, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment