Skip to content

Commit

Permalink
Merge pull request silverstripe#656 from sachajudd/pulls/1/fix-more-o…
Browse files Browse the repository at this point in the history
…ptions

FIX Revert changes to default dropdownToggleClassNames on ActionMenu
  • Loading branch information
robbieaverill authored Sep 20, 2018
2 parents 65579ca + a9b2443 commit ed3e5c3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/components/ActionMenu/ActionMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ ActionMenu.defaultProps = {
dropdownToggleClassNames: [
'action-menu__toggle',
'btn',
'btn-sm',
'btn--no-text',
'btn--icon-xl',
'font-icon-dot-3'
],
dropdownToggleProps: {},
Expand Down
12 changes: 11 additions & 1 deletion client/src/components/GridFieldActions/GridFieldActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,19 @@ class GridFieldActions extends PureComponent {
}, []);

const dropdownMenuProps = { right: true };
const dropdownToggleClassNames = [
'action-menu__toggle',
'btn',
'btn--no-text',
'btn-sm',
'font-icon-dot-3'
];

return (
<ActionMenu dropdownMenuProps={dropdownMenuProps}>
<ActionMenu
dropdownMenuProps={dropdownMenuProps}
dropdownToggleClassNames={dropdownToggleClassNames}
>
{Object.keys(groupedActions).map(
(group, index) => [
index !== 0 && <DropdownItem divider />,
Expand Down

0 comments on commit ed3e5c3

Please sign in to comment.