Skip to content
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

Jump to bottom

Gave disabled prop priority when determining button styles. #432

Merged
merged 1 commit into from
Mar 16, 2015
Merged

Gave disabled prop priority when determining button styles. #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/js/flat-button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ var FlatButton = React.createClass({
...other
} = this.props;
var classes = this.getClasses('mui-flat-button', {
'mui-is-primary': primary,
'mui-is-secondary': !primary && secondary
'mui-is-primary': !this.props.disabled && primary,
'mui-is-secondary': !this.props.disabled && !primary && secondary
});
var children;

Expand Down
2 changes: 1 addition & 1 deletion src/js/floating-action-button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var RaisedButton = React.createClass({
...other } = this.props;
var classes = this.getClasses('mui-floating-action-button', {
'mui-is-mini': mini,
'mui-is-secondary': secondary
'mui-is-secondary': !this.props.disabled && secondary
});

var icon;
Expand Down
4 changes: 2 additions & 2 deletions src/js/raised-button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ var RaisedButton = React.createClass({
secondary,
...other } = this.props;
var classes = this.getClasses('mui-raised-button', {
'mui-is-primary': primary,
'mui-is-secondary': !primary && secondary
'mui-is-primary': !this.props.disabled && primary,
'mui-is-secondary': !this.props.disabled && !primary && secondary
});
var children;

Expand Down