diff --git a/packages/mui-material/src/CardHeader/CardHeader.js b/packages/mui-material/src/CardHeader/CardHeader.js index 2e281423b7d762..ae0ad34588c713 100644 --- a/packages/mui-material/src/CardHeader/CardHeader.js +++ b/packages/mui-material/src/CardHeader/CardHeader.js @@ -64,12 +64,10 @@ const CardHeaderContent = styled('div', { slot: 'Content', })({ flex: '1 1 auto', - [`.${typographyClasses.root}:where(& .${cardHeaderClasses.title})`]: { - display: 'block', - }, - [`.${typographyClasses.root}:where(& .${cardHeaderClasses.subheader})`]: { - display: 'block', - }, + [`.${typographyClasses.root}:where(& .${cardHeaderClasses.title}), .${typographyClasses.root}:where(& .${cardHeaderClasses.subheader})`]: + { + display: 'block', + }, }); const CardHeader = React.forwardRef(function CardHeader(inProps, ref) { diff --git a/packages/mui-material/src/ListItemText/ListItemText.js b/packages/mui-material/src/ListItemText/ListItemText.js index c4359a63289c4d..9b1a66aabcf573 100644 --- a/packages/mui-material/src/ListItemText/ListItemText.js +++ b/packages/mui-material/src/ListItemText/ListItemText.js @@ -42,12 +42,10 @@ const ListItemTextRoot = styled('div', { minWidth: 0, marginTop: 4, marginBottom: 4, - [`.${typographyClasses.root}:where(& .${listItemTextClasses.primary})`]: { - display: 'block', - }, - [`.${typographyClasses.root}:where(& .${listItemTextClasses.secondary})`]: { - display: 'block', - }, + [`.${typographyClasses.root}:where(& .${listItemTextClasses.primary}), .${typographyClasses.root}:where(& .${listItemTextClasses.secondary})`]: + { + display: 'block', + }, variants: [ { props: ({ ownerState }) => ownerState.primary && ownerState.secondary, diff --git a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js index 73c4c66477e375..9954f271fee9e4 100644 --- a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js +++ b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js @@ -62,6 +62,10 @@ const SpeedDialIconRoot = styled('span', { [`& .${speedDialIconClasses.icon}`]: { transform: 'rotate(45deg)', }, + [`& .${speedDialIconClasses.openIcon}`]: { + transform: 'rotate(0deg)', + opacity: 1, + }, }, }, { @@ -72,15 +76,6 @@ const SpeedDialIconRoot = styled('span', { }, }, }, - { - props: ({ ownerState }) => ownerState.open, - style: { - [`& .${speedDialIconClasses.openIcon}`]: { - transform: 'rotate(0deg)', - opacity: 1, - }, - }, - }, ], })), ); diff --git a/packages/mui-material/src/StepIcon/StepIcon.js b/packages/mui-material/src/StepIcon/StepIcon.js index 76a10114622c07..d00e1834d58c7c 100644 --- a/packages/mui-material/src/StepIcon/StepIcon.js +++ b/packages/mui-material/src/StepIcon/StepIcon.js @@ -32,10 +32,7 @@ const StepIconRoot = styled(SvgIcon, { duration: theme.transitions.duration.shortest, }), color: (theme.vars || theme).palette.text.disabled, - [`&.${stepIconClasses.completed}`]: { - color: (theme.vars || theme).palette.primary.main, - }, - [`&.${stepIconClasses.active}`]: { + [`&.${stepIconClasses.completed}, &.${stepIconClasses.active}`]: { color: (theme.vars || theme).palette.primary.main, }, [`&.${stepIconClasses.error}`]: { diff --git a/packages/mui-material/src/StepLabel/StepLabel.js b/packages/mui-material/src/StepLabel/StepLabel.js index 80626419810b46..40fac5edc66641 100644 --- a/packages/mui-material/src/StepLabel/StepLabel.js +++ b/packages/mui-material/src/StepLabel/StepLabel.js @@ -83,11 +83,7 @@ const StepLabelLabel = styled('span', { transition: theme.transitions.create('color', { duration: theme.transitions.duration.shortest, }), - [`&.${stepLabelClasses.active}`]: { - color: (theme.vars || theme).palette.text.primary, - fontWeight: 500, - }, - [`&.${stepLabelClasses.completed}`]: { + [`&.${stepLabelClasses.active}, &.${stepLabelClasses.completed}`]: { color: (theme.vars || theme).palette.text.primary, fontWeight: 500, },