Skip to content

Commit

Permalink
fix(button): Take account pr fix to release new version. Use span ins…
Browse files Browse the repository at this point in the history
…ide button. Styling fixes.
  • Loading branch information
Temzasse committed Dec 30, 2017
1 parent 347c23c commit faa9f3f
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const ButtonWrapper = styled.button`
}
`;

const ButtonContent = withRipple(styled.div`
const ButtonContent = withRipple(styled.span`
display: flex;
flex-direction: row;
align-items: center;
Expand All @@ -126,14 +126,16 @@ const rippleStyles = {
const Button = ({ children, ...rest }) => {
const { disabled, small, large, className } = rest;
return (
<ButtonWrapper {...rest}
>
<ButtonContent {...{ disabled, small, large, className }} wrapperStyles={rippleStyles}>
<ButtonWrapper {...rest}>
<ButtonContent
{...{ disabled, small, large, className }}
wrapperStyles={rippleStyles}
>
{children}
</ButtonContent>
</ButtonWrapper>
);
}
};

Button.propTypes = {
children: PropTypes.any,
Expand Down

0 comments on commit faa9f3f

Please sign in to comment.