Skip to content

Commit

Permalink
[TimeDisplay] Inherit text color from theme (#5816)
Browse files Browse the repository at this point in the history
* TimeDisplay: Inherit color from theme

* PR #5816: timePicker.textColor should inherit palette.textColor

* PR #5816: scratch that. It should inherit palette.alternateTextColor
  • Loading branch information
remon-nashid authored and oliviertassinari committed Dec 24, 2016
1 parent 8970ddc commit 33d4237
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/TimePicker/TimeDisplay.js
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,
},
text: {
margin: '6px 0',
Expand Down
2 changes: 1 addition & 1 deletion src/styles/getMuiTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export default function getMuiTheme(muiTheme, ...more) {
},
timePicker: {
color: palette.alternateTextColor,
textColor: palette.accent3Color,
textColor: palette.alternateTextColor,
accentColor: palette.primary1Color,
clockColor: palette.textColor,
clockCircleColor: palette.clockCircleColor,
Expand Down

0 comments on commit 33d4237

Please sign in to comment.