From 4bf3843cb341b639243e68abde23fad5c7923f98 Mon Sep 17 00:00:00 2001 From: mim Date: Sat, 7 Jul 2018 13:47:53 -0500 Subject: [PATCH 1/3] attemting to fix Issue #11837 ( where the CircularProgress size were incorrect when rendered in a Dialog ) --- packages/material-ui/src/Button/Button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/material-ui/src/Button/Button.js b/packages/material-ui/src/Button/Button.js index 4c1092028b3d23..611fa8f44a6ae4 100644 --- a/packages/material-ui/src/Button/Button.js +++ b/packages/material-ui/src/Button/Button.js @@ -13,7 +13,7 @@ export const styles = theme => ({ ...theme.typography.button, lineHeight: '1.4em', // Improve readability for multiline button. boxSizing: 'border-box', - minWidth: 88, + minWidth: theme.spacing.unit * 8, minHeight: 36, padding: '8px 16px', borderRadius: theme.shape.borderRadius, From b547f5b18ff57cda5d6d5c5baf656a2551d9aef1 Mon Sep 17 00:00:00 2001 From: mim Date: Sat, 7 Jul 2018 14:42:36 -0500 Subject: [PATCH 2/3] changint the max-with to the calculated amount instead of using theme.spacing.unit * 8 --- packages/material-ui/src/Button/Button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/material-ui/src/Button/Button.js b/packages/material-ui/src/Button/Button.js index 611fa8f44a6ae4..6e5aad2b0578ad 100644 --- a/packages/material-ui/src/Button/Button.js +++ b/packages/material-ui/src/Button/Button.js @@ -13,7 +13,7 @@ export const styles = theme => ({ ...theme.typography.button, lineHeight: '1.4em', // Improve readability for multiline button. boxSizing: 'border-box', - minWidth: theme.spacing.unit * 8, + minWidth: 64, minHeight: 36, padding: '8px 16px', borderRadius: theme.shape.borderRadius, From 0344b94a8bf3b89d42c2c307f3a01b4ff49d70c9 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 9 Jul 2018 09:37:59 +0200 Subject: [PATCH 3/3] remove dialog action min-width --- packages/material-ui/src/DialogActions/DialogActions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/material-ui/src/DialogActions/DialogActions.js b/packages/material-ui/src/DialogActions/DialogActions.js index c13b9c792d4ec3..b2d2416420be50 100644 --- a/packages/material-ui/src/DialogActions/DialogActions.js +++ b/packages/material-ui/src/DialogActions/DialogActions.js @@ -15,7 +15,6 @@ export const styles = { }, action: { margin: '0 4px', - minWidth: 64, }, };