diff --git a/packages/material-ui/src/ButtonGroup/ButtonGroup.js b/packages/material-ui/src/ButtonGroup/ButtonGroup.js index 0805cd922f1470..38e3aec6b23d6d 100644 --- a/packages/material-ui/src/ButtonGroup/ButtonGroup.js +++ b/packages/material-ui/src/ButtonGroup/ButtonGroup.js @@ -4,7 +4,11 @@ import clsx from 'clsx'; import capitalize from '../utils/capitalize'; import { fade } from '../styles/colorManipulator'; import withStyles from '../styles/withStyles'; -import '../Button'; // So we don't have any override priority issue. +import Button from '../Button'; + +// Force a side effect so we don't have any override priority issue. +// eslint-disable-next-line no-unused-expressions +Button.styles; export const styles = theme => ({ /* Styles applied to the root element. */ diff --git a/packages/material-ui/src/CardActions/CardActions.js b/packages/material-ui/src/CardActions/CardActions.js index ee57f01201adee..91b7c574ac5067 100644 --- a/packages/material-ui/src/CardActions/CardActions.js +++ b/packages/material-ui/src/CardActions/CardActions.js @@ -2,7 +2,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import withStyles from '../styles/withStyles'; -import '../Button'; // So we don't have any override priority issue. export const styles = { /* Styles applied to the root element. */ @@ -13,7 +12,7 @@ export const styles = { }, /* Styles applied to the root element if `disableSpacing={false}`. */ spacing: { - '& > * + *': { + '& > :not(:first-child)': { marginLeft: 8, }, }, diff --git a/packages/material-ui/src/DialogActions/DialogActions.js b/packages/material-ui/src/DialogActions/DialogActions.js index 6fb342f5cc7d22..458c61350d971b 100644 --- a/packages/material-ui/src/DialogActions/DialogActions.js +++ b/packages/material-ui/src/DialogActions/DialogActions.js @@ -2,7 +2,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import withStyles from '../styles/withStyles'; -import '../Button'; // So we don't have any override priority issue. export const styles = { /* Styles applied to the root element. */ @@ -15,7 +14,7 @@ export const styles = { }, /* Styles applied to the root element if `disableSpacing={false}`. */ spacing: { - '& > * + *': { + '& > :not(:first-child)': { marginLeft: 8, }, }, diff --git a/packages/material-ui/src/ExpansionPanelActions/ExpansionPanelActions.js b/packages/material-ui/src/ExpansionPanelActions/ExpansionPanelActions.js index 5451c638738196..2e3f9f179ac276 100644 --- a/packages/material-ui/src/ExpansionPanelActions/ExpansionPanelActions.js +++ b/packages/material-ui/src/ExpansionPanelActions/ExpansionPanelActions.js @@ -2,7 +2,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import withStyles from '../styles/withStyles'; -import '../Button'; // So we don't have any override priority issue. export const styles = { /* Styles applied to the root element. */ @@ -14,7 +13,7 @@ export const styles = { }, /* Styles applied to the root element if `disableSpacing={false}`. */ spacing: { - '& > * + *': { + '& > :not(:first-child)': { marginLeft: 8, }, },