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

[TimeDisplay] Inherit text color from theme #5816

Merged
merged 3 commits into from
Dec 24, 2016
Merged

[TimeDisplay] Inherit text color from theme #5816

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dc0f5d
TimeDisplay: Inherit color from theme
remon-nashid Dec 23, 2016
6a27309
PR #5816: timePicker.textColor should inherit palette.textColor
remon-nashid Dec 23, 2016
675a549
PR #5816: scratch that. It should inherit palette.alternateTextColor
remon-nashid Dec 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/TimePicker/TimeDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class TimeDisplay extends Component {
borderTopLeftRadius: 2,
borderTopRightRadius: 2,
backgroundColor: timePicker.headerColor,
color: 'white',
color: timePicker.textColor,
Copy link
Member

Choose a reason for hiding this comment

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

That's a breaking change. We can't merge like that.

timePicker.textColor = palette.accent3Color

I think that we should change that line with palette.textColor
https://github.com/callemall/material-ui/blob/master/src/styles/getMuiTheme.js#L296

Copy link
Author

Choose a reason for hiding this comment

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

Thanks @oliviertassinari! That makes a lot of sense. I'll update the PR accordingly.

},
text: {
margin: '6px 0',
Expand Down