Skip to content

Commit

Permalink
Merge pull request #2016 from KapJI/theme-fix
Browse files Browse the repository at this point in the history
[Theme] Fix Slider and Toggle colors
  • Loading branch information
oliviertassinari committed Nov 4, 2015
2 parents 8f5510a + 308a7a2 commit 789eaee
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/styles/raw-themes/light-raw-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {
palette: {
primary1Color: Colors.cyan500,
primary2Color: Colors.cyan700,
primary3Color: Colors.lightBlack,
primary3Color: Colors.grey400,
accent1Color: Colors.pinkA200,
accent2Color: Colors.grey100,
accent3Color: Colors.grey500,
Expand Down
8 changes: 4 additions & 4 deletions src/styles/theme-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ module.exports = {
handleSize: 12,
handleSizeDisabled: 8,
handleSizeActive: 18,
handleColorZero: rawTheme.palette.borderColor,
handleColorZero: rawTheme.palette.primary3Color,
handleFillColor: rawTheme.palette.alternateTextColor,
selectionColor: rawTheme.palette.primary1Color,
rippleColor: rawTheme.palette.primary1Color,
Expand All @@ -135,13 +135,13 @@ module.exports = {
borderColor: rawTheme.palette.borderColor,
},
tableHeaderColumn: {
textColor: rawTheme.palette.primary3Color,
textColor: rawTheme.palette.accent3Color,
height: 56,
spacing: 24,
},
tableFooter: {
borderColor: rawTheme.palette.borderColor,
textColor: rawTheme.palette.primary3Color,
textColor: rawTheme.palette.accent3Color,
},
tableRow: {
hoverColor: rawTheme.palette.accent2Color,
Expand All @@ -158,7 +158,7 @@ module.exports = {
color: rawTheme.palette.alternateTextColor,
textColor: rawTheme.palette.accent3Color,
accentColor: rawTheme.palette.primary1Color,
clockColor: rawTheme.palette.primary3Color,
clockColor: rawTheme.palette.textColor,
selectColor: rawTheme.palette.primary2Color,
selectTextColor: rawTheme.palette.alternateTextColor,
},
Expand Down

0 comments on commit 789eaee

Please sign in to comment.