Skip to content

Fix padding for modal actions #204

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

Merged
merged 1 commit into from
Jan 24, 2020
Merged

Fix padding for modal actions #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/react-components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# [Unreleased](https://github.com/puppetlabs/design-system/compare/@puppet/[email protected])

- [ActionSelect, ButtonSelect] Add `width` prop to ActionSelect and ButtonSelect (by [@rhyza](https://github.com/rhyza) in [#199](https://github.com/puppetlabs/design-system/pull/199))
- [Breadcrumb] Fix Breadcrumb accessibility and focusability
- [ActionSelect, ButtonSelect] Add `width` prop to ActionSelect and ButtonSelect (by [@rhyza](https://github.com/rhyza) in [#201](https://github.com/puppetlabs/design-system/pull/201))
- [Breadcrumb] Fix Breadcrumb accessibility and focusability (by [@rhyza](https://github.com/rhyza) in [#199](https://github.com/puppetlabs/design-system/pull/199))
- [Modal] Fix padding for modal actions, an issue introduced in 5.11.1 (by [@vine77](https://github.com/vine77) in [#204](https://github.com/puppetlabs/design-system/pull/204))

# [5.13.1](https://github.com/puppetlabs/design-system/compare/@puppet/[email protected]...@puppet/[email protected]) (2020-01-22)

Expand Down
3 changes: 2 additions & 1 deletion packages/react-components/source/react/library/modal/Modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ class Modal extends Component {
const { pluckedDescendants: actions, otherDescendants } = filterDescendants(
{
children,
filter: childTypeName => childTypeName === 'ModalActions',
components: ModalActions,
},
);

const hasActions = actions.length > 0;

return (
Expand Down