Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SpeedDial] Change actions background color #14640

Merged
merged 13 commits into from
Mar 7, 2019
Merged

[SpeedDial] Change actions background color #14640

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0740f1b
Add color property for passing to Fab component
hburrows Feb 23, 2019
ab1a69b
Fix eslint line length issue
hburrows Feb 23, 2019
2f4e629
Updating documentation markdown; updating typescript declaration
hburrows Feb 23, 2019
9dfd59b
Changing default color of action buttons from grey to white to align …
hburrows Mar 4, 2019
8145ee9
Merge branch 'next' of github.com:mui-org/material-ui into speeddial-…
hburrows Mar 4, 2019
a447055
Merge branch 'next' of github.com:mui-org/material-ui into speeddial-…
hburrows Mar 5, 2019
0e90605
Reverting dedicated color prop in favor of using ButtonProps for expr…
hburrows Mar 5, 2019
5612cc0
Updating doc after reverting dedicated color prop
hburrows Mar 5, 2019
d399d05
Merge branch 'next' of github.com:mui-org/material-ui into speeddial-…
hburrows Mar 5, 2019
1529dfb
Reverting mistakenly including PR #14641
hburrows Mar 5, 2019
6248887
Adding back default Fab color styling of 'primary'
hburrows Mar 5, 2019
286d637
Changing how Fab color is faulted; previous impl. doesn't work correclty
hburrows Mar 6, 2019
a19c618
Remove redundant code
oliviertassinari Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/SpeedDialAction/SpeedDialAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ export const styles = theme => ({
button: {
margin: 8,
color: theme.palette.text.secondary,
backgroundColor: emphasize(theme.palette.background.default, 0.12),
backgroundColor: theme.palette.common.white,
'&:hover': {
backgroundColor: emphasize(theme.palette.background.default, 0.15),
backgroundColor: emphasize(theme.palette.common.white, 0.15),
},
transition: `${theme.transitions.create('transform', {
duration: theme.transitions.duration.shorter,
Expand Down