Skip to content

Remove duplicate toolbarcontainer class name #12357

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
youknowriad merged 2 commits into from
Dec 20, 2018
Merged

Remove duplicate toolbarcontainer class name #12357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d12416
Remove duplicate toolbarcontainer class name
johngodley Nov 27, 2018
11eb7fe
Swap components-toolbar between container and toolbar
johngodley Dec 4, 2018
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
Prev Previous commit
Swap components-toolbar between container and toolbar
  • Loading branch information
@johngodley
johngodley committed Dec 4, 2018
commit 11eb7fe6db2e5c821668cbdf70bfbb24bc69bbc5
2 changes: 1 addition & 1 deletion packages/components/src/toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function Toolbar( { controls = [], children, className, isCollapsed, icon, label
}

return (
<ToolbarContainer className={ className }>
<ToolbarContainer className={ classnames( 'components-toolbar', className ) }>
{ flatMap( controlSets, ( controlSet, indexOfSet ) => (
controlSet.map( ( control, indexOfControl ) => (
<ToolbarButton
Expand Down
7 changes: 1 addition & 6 deletions packages/components/src/toolbar/toolbar-container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
/**
* External dependencies
*/
import classnames from 'classnames';

const ToolbarContainer = ( props ) => (
<div className={ classnames( 'components-toolbar', props.className ) }>
<div className={ props.className }>
{ props.children }
</div>
);
Expand Down