Skip to content

Commit

Permalink
Merge pull request #4621 from alitaheri/reapply-4561
Browse files Browse the repository at this point in the history
[SvgIcon] Add themeable color
  • Loading branch information
nathanmarks committed Jul 4, 2016
2 parents 06f4220 + f405193 commit 133d10b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/SvgIcon/SvgIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class SvgIcon extends Component {
} = this.props;

const {
baseTheme,
svgIcon,
prepareStyles,
} = this.context.muiTheme;

Expand All @@ -84,7 +84,7 @@ class SvgIcon extends Component {

const mergedStyles = Object.assign({
display: 'inline-block',
color: baseTheme.palette.textColor,
color: svgIcon.color,
fill: this.state.hovered ? onColor : offColor,
height: 24,
width: 24,
Expand Down
3 changes: 3 additions & 0 deletions src/styles/getMuiTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ export default function getMuiTheme(muiTheme, ...more) {
disabledTextColor: fade(black, 0.26),
connectorLineColor: grey400,
},
svgIcon: {
color: palette.textColor,
},
table: {
backgroundColor: palette.canvasColor,
},
Expand Down

0 comments on commit 133d10b

Please sign in to comment.