Skip to content

Changing Button CSS proptype order #133

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
jeroenransijn merged 2 commits into from
Feb 12, 2018
Merged

Changing Button CSS proptype order #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1584c9
Changing proptype precedence
fforres Feb 12, 2018
cbc01f2
fix eslint
fforres Feb 12, 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
11 changes: 8 additions & 3 deletions src/buttons/src/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ export default class Button extends PureComponent {
/**
* The aim of the right icon. Useful to aim a triangle down.
*/
iconAfterAim: PropTypes.oneOf(Object.keys(IconAim))
iconAfterAim: PropTypes.oneOf(Object.keys(IconAim)),

/**
* A JavaScript object to override css styling
*/
css: PropTypes.object
}

static defaultProps = {
Expand Down Expand Up @@ -133,8 +138,8 @@ export default class Button extends PureComponent {
margin={0} // Removes weird margins in Safari
{...textStyle}
css={{
...css,
...appearanceStyle
...appearanceStyle,
...css
}}
height={height}
lineHeight={`${height}px`}
Expand Down