Skip to content

Commit

Permalink
Fix material-ui warnings due to wrong styles in theme (#124)
Browse files Browse the repository at this point in the history
Fix material-ui warnings due to wrong styles in theme
  • Loading branch information
padawannn authored Mar 17, 2021
1 parent bc5fcec commit a2c25c3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Not released

- Fix material-ui warnings due to wrong styles in theme [#124](https://github.com/CartoDB/carto-react/pull/124)
- Add Widgets from @carto/react-widgets to StoryBook [#120](https://github.com/CartoDB/carto-react/pull/120)
- Improve GoogleMap component [#121](https://github.com/CartoDB/carto-react/pull/121)

Expand Down
12 changes: 8 additions & 4 deletions packages/react-ui/src/theme/carto-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,9 @@ export const cartoThemeOptions = {
}
},
MuiInputLabel: {
...variables.typography.body1,
root: {
...variables.typography.body1
},

formControl: {
transform: 'translate(16px, 20px) scale(1)',
Expand Down Expand Up @@ -693,7 +695,7 @@ export const cartoThemeOptions = {
marginBottom: spacing(1.5),
color: variables.palette.text.secondary,

'&$disabled': {
'&:disabled': {
color: variables.palette.action.disabled
},

Expand Down Expand Up @@ -748,8 +750,10 @@ export const cartoThemeOptions = {
MuiSelect: {
selectMenu: {},

'&$hover': {
backgroundColor: 'transparent'
root: {
'&:hover': {
backgroundColor: 'transparent'
}
},

select: {
Expand Down

0 comments on commit a2c25c3

Please sign in to comment.