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.

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

[style] Use 'default' cursor for disabled component states #6700

Merged
merged 2 commits into from
Apr 27, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/DatePicker/DateDisplay.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function getStyles(props, context, state) {
marginBottom: 10,
},
yearTitle: {
cursor: props.disableYearSelection ? 'not-allowed' : (!selectedYear ? 'pointer' : 'default'),
cursor: props.disableYearSelection || selectedYear ? 'default' : 'pointer',
},
};

Expand Down
2 changes: 1 addition & 1 deletion src/IconButton/IconButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function getStyles(props, context) {
disabled: {
color: baseTheme.palette.disabledColor,
fill: baseTheme.palette.disabledColor,
cursor: 'not-allowed',
cursor: 'default',
},
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/MenuItem/MenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function getStyles(props, context) {
const styles = {
root: {
color: props.disabled ? disabledColor : textColor,
cursor: props.disabled ? 'not-allowed' : 'pointer',
cursor: props.disabled ? 'default' : 'pointer',
minHeight: props.desktop ? '32px' : '48px',
lineHeight: props.desktop ? '32px' : '48px',
fontSize: props.desktop ? 15 : 16,
Expand Down
2 changes: 1 addition & 1 deletion src/Stepper/StepLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const getStyles = ({active, completed, disabled}, {muiTheme, stepper}) => {
if (disabled) {
styles.icon.color = inactiveIconColor;
styles.root.color = disabledTextColor;
styles.root.cursor = 'not-allowed';
styles.root.cursor = 'default';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/home/travis/build/callemall/material-ui/src/Stepper/StepLabel.js
50:36 error Trailing spaces not allowed no-trailing-spaces

}

return styles;
Expand Down
2 changes: 1 addition & 1 deletion src/Table/TableBody.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class TableBody extends Component {
columnNumber={0}
style={{
width: 24,
cursor: disabled ? 'not-allowed' : 'inherit',
cursor: disabled ? 'default' : 'inherit',
}}
>
<Checkbox
Expand Down
2 changes: 1 addition & 1 deletion src/Table/TableHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class TableHeader extends Component {
key={key}
style={{
width: 24,
cursor: disabled ? 'not-allowed' : 'inherit',
cursor: disabled ? 'default' : 'inherit',
}}
/>
);
Expand Down