Making card-text pull its text color from the theme

tyfoo · Oct 27, 2015 · 23e4080 · 23e4080
1 parent aa7e541
commit 23e4080
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/card/card-text.jsx b/src/card/card-text.jsx
@@ -44,18 +44,13 @@ const CardText = React.createClass({
     actAsExpander: React.PropTypes.bool,
   },
 
-  getDefaultProps() {
-    return {
-      color: Styles.Colors.ck,
-    };
-  },
-
   getStyles() {
+    let 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
@@ -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,