diff --git a/src/card/card-text.jsx b/src/card/card-text.jsx index 021f7e6ac228fe..506eb85ff36954 100644 --- a/src/card/card-text.jsx +++ b/src/card/card-text.jsx @@ -25,7 +25,7 @@ const CardText = React.createClass({ }, getInitialState() { - return { + return { muiTheme: this.context.muiTheme ? this.context.muiTheme : ThemeManager.getMuiTheme(DefaultRawTheme), }; }, @@ -44,18 +44,13 @@ const CardText = React.createClass({ actAsExpander: React.PropTypes.bool, }, - getDefaultProps() { - return { - color: Styles.Colors.ck, - }; - }, - getStyles() { + const themeVariables = this.state.muiTheme.cardText; return { root: { padding: 16, fontSize: '14px', - color: this.props.color, + color: this.props.color ? this.props.color : themeVariables.textColor, }, }; }, diff --git a/src/styles/theme-manager.js b/src/styles/theme-manager.js index a9a682cf934e55..65abe773162553 100644 --- a/src/styles/theme-manager.js +++ b/src/styles/theme-manager.js @@ -21,6 +21,9 @@ module.exports = { minWidth: 88, iconButtonSize: rawTheme.spacing.iconSize * 2, }, + cardText: { + textColor: rawTheme.palette.textColor, + }, checkbox: { boxColor: rawTheme.palette.textColor, checkedColor: rawTheme.palette.primary1Color, @@ -180,6 +183,8 @@ module.exports = { }, tabs: { backgroundColor: rawTheme.palette.primary1Color, + textColor: ColorManipulator.fade(rawTheme.palette.alternateTextColor, 0.6), + selectedTextColor: rawTheme.palette.alternateTextColor, }, textField: { textColor: rawTheme.palette.textColor, diff --git a/src/tabs/tab.jsx b/src/tabs/tab.jsx index 7ac1629dd38dda..81ffde47dadbbd 100644 --- a/src/tabs/tab.jsx +++ b/src/tabs/tab.jsx @@ -68,7 +68,7 @@ const Tab = React.createClass({ textAlign: 'center', verticalAlign: 'middle', height: 48, - color: selected ? 'rgba(255,255,255,1)' : 'rgba(255,255,255,0.6)', + color: selected ? this.state.muiTheme.tabs.selectedTextColor : this.state.muiTheme.tabs.textColor, outline: 'none', fontSize: 14, fontWeight: 500,