Skip to content

Commit

Permalink
Merge pull request #3529 from newsiberian/3456-flatButton-icon-align-fix
Browse files Browse the repository at this point in the history
[FlatButton] Fix icon alignment when no label provided
  • Loading branch information
nathanmarks committed Mar 1, 2016
2 parents f312f07 + a2ee2d4 commit 9e0b348
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/flat-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ const FlatButton = React.createClass({
label,
labelStyle,
labelPosition,
linkButton,
primary,
rippleColor,
secondary,
Expand Down Expand Up @@ -257,6 +258,7 @@ const FlatButton = React.createClass({
verticalAlign: 'middle',
marginLeft: label && labelPosition !== 'before' ? 12 : 0,
marginRight: label && labelPosition === 'before' ? 12 : 0,
display: label || !linkButton ? 'inline-block' : 'block',
},
});

Expand Down

0 comments on commit 9e0b348

Please sign in to comment.