[CardActions] Fix CSS override (#11092)

mui · Apr 21, 2018 · 643460a · 643460a
1 parent 1d9e576
commit 643460a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/material-ui/src/Card/CardActions.js b/packages/material-ui/src/Card/CardActions.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import withStyles from '../styles/withStyles';
 import { cloneChildrenWithClassName } from '../utils/reactHelpers';
+import '../Button'; // So we don't have any override priority issue.
 
 export const styles = theme => ({
   root: {

diff --git a/packages/material-ui/src/Dialog/DialogActions.js b/packages/material-ui/src/Dialog/DialogActions.js
@@ -7,11 +7,11 @@ import '../Button'; // So we don't have any override priority issue.
 
 export const styles = theme => ({
   root: {
-    flex: '0 0 auto',
-    margin: `${theme.spacing.unit}px ${theme.spacing.unit / 2}px`,
     display: 'flex',
-    justifyContent: 'flex-end',
     alignItems: 'center',
+    justifyContent: 'flex-end',
+    flex: '0 0 auto',
+    margin: `${theme.spacing.unit}px ${theme.spacing.unit / 2}px`,
   },
   action: {
     margin: `0 ${theme.spacing.unit / 2}px`,

diff --git a/packages/material-ui/src/ExpansionPanel/ExpansionPanelActions.js b/packages/material-ui/src/ExpansionPanel/ExpansionPanelActions.js
@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import withStyles from '../styles/withStyles';
 import { cloneChildrenWithClassName } from '../utils/reactHelpers';
+import '../Button'; // So we don't have any override priority issue.
 
 export const styles = theme => ({
   root: {
     display: 'flex',
-    justifyContent: 'flex-end',
     alignItems: 'center',
+    justifyContent: 'flex-end',
     padding: `${theme.spacing.unit * 2}px ${theme.spacing.unit}px`,
   },
   action: {