Making tabs use theme colors for their text

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

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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),
     };
   },
@@ -45,7 +45,7 @@ const CardText = React.createClass({
   },
 
   getStyles() {
-    let themeVariables = this.state.muiTheme.cardText;
+    const themeVariables = this.state.muiTheme.cardText;
     return {
       root: {
         padding: 16,

diff --git a/src/styles/theme-manager.js b/src/styles/theme-manager.js
@@ -183,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
@@ -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,