From 6da60e5891a0e74ba3f4850550bb9bb66084a73d Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Tue, 18 Dec 2018 20:09:48 +0100
Subject: [PATCH] a second try

---
 docs/src/pages/demos/buttons/CustomizedButtons.js     |  6 +-----
 packages/material-ui/src/Button/Button.js             | 11 ++++++-----
 packages/material-ui/src/ListItemText/ListItemText.js | 10 +++++++---
 .../material-ui/src/ListItemText/ListItemText.test.js |  4 ++--
 packages/material-ui/src/styles/createTypography.js   |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/docs/src/pages/demos/buttons/CustomizedButtons.js b/docs/src/pages/demos/buttons/CustomizedButtons.js
index d6109a89de44ef..d70ff7d5a397b7 100644
--- a/docs/src/pages/demos/buttons/CustomizedButtons.js
+++ b/docs/src/pages/demos/buttons/CustomizedButtons.js
@@ -7,10 +7,6 @@ import purple from '@material-ui/core/colors/purple';
 import green from '@material-ui/core/colors/green';
 
 const styles = theme => ({
-  container: {
-    display: 'flex',
-    flexWrap: 'wrap',
-  },
   margin: {
     margin: theme.spacing.unit,
   },
@@ -69,7 +65,7 @@ function CustomizedInputs(props) {
   const { classes } = props;
 
   return (
-    <div className={classes.container}>
+    <div>
       <Button
         variant="contained"
         color="primary"
diff --git a/packages/material-ui/src/Button/Button.js b/packages/material-ui/src/Button/Button.js
index b0ec6a4d6896fa..2b5e8fde5e326c 100644
--- a/packages/material-ui/src/Button/Button.js
+++ b/packages/material-ui/src/Button/Button.js
@@ -13,6 +13,7 @@ import { capitalize } from '../utils/helpers';
 export const styles = theme => ({
   /* Styles applied to the root element. */
   root: {
+    lineHeight: 1.625, // To remove with v4.
     ...theme.typography.button,
     boxSizing: 'border-box',
     minWidth: 64,
@@ -47,7 +48,7 @@ export const styles = theme => ({
   },
   /* Styles applied to the root element if `variant="text"`. */
   text: {
-    padding: theme.spacing.unit,
+    padding: '6px 8px',
   },
   /* Styles applied to the root element if `variant="text"` and `color="primary"`. */
   textPrimary: {
@@ -207,16 +208,16 @@ export const styles = theme => ({
   },
   /* Styles applied to the root element if `size="small"`. */
   sizeSmall: {
-    padding: '7px 8px',
+    padding: '4px 8px',
     minWidth: 64,
-    minHeight: 32,
+    minHeight: 31,
     fontSize: theme.typography.pxToRem(13),
   },
   /* Styles applied to the root element if `size="large"`. */
   sizeLarge: {
     padding: '8px 24px',
-    minWidth: 112,
-    minHeight: 40,
+    minHeight: 42,
+    lineHeight: 1.625,
     fontSize: theme.typography.pxToRem(15),
   },
   /* Styles applied to the root element if `fullWidth={true}`. */
diff --git a/packages/material-ui/src/ListItemText/ListItemText.js b/packages/material-ui/src/ListItemText/ListItemText.js
index ab06922bc692a6..985fef303199b3 100644
--- a/packages/material-ui/src/ListItemText/ListItemText.js
+++ b/packages/material-ui/src/ListItemText/ListItemText.js
@@ -52,6 +52,7 @@ function ListItemText(props) {
     primaryTypographyProps,
     secondary: secondaryProp,
     secondaryTypographyProps,
+    theme,
     ...other
   } = props;
 
@@ -62,8 +63,7 @@ function ListItemText(props) {
         if (primary != null && primary.type !== Typography && !disableTypography) {
           primary = (
             <Typography
-              variant="subheading"
-              internalDeprecatedVariant
+              variant={theme.typography.useNextVariants ? 'body1' : 'subheading'}
               className={classNames(classes.primary, { [classes.textDense]: dense })}
               component="span"
               {...primaryTypographyProps}
@@ -153,6 +153,10 @@ ListItemText.propTypes = {
    * (as long as disableTypography is not `true`).
    */
   secondaryTypographyProps: PropTypes.object,
+  /**
+   * @ignore
+   */
+  theme: PropTypes.object.isRequired,
 };
 
 ListItemText.defaultProps = {
@@ -160,4 +164,4 @@ ListItemText.defaultProps = {
   inset: false,
 };
 
-export default withStyles(styles, { name: 'MuiListItemText' })(ListItemText);
+export default withStyles(styles, { name: 'MuiListItemText', withTheme: true })(ListItemText);
diff --git a/packages/material-ui/src/ListItemText/ListItemText.test.js b/packages/material-ui/src/ListItemText/ListItemText.test.js
index 5d2f5756730152..044f4254e34a51 100644
--- a/packages/material-ui/src/ListItemText/ListItemText.test.js
+++ b/packages/material-ui/src/ListItemText/ListItemText.test.js
@@ -52,7 +52,7 @@ describe('<ListItemText />', () => {
       const listItemText = findOutermostIntrinsic(wrapper);
       const typography = listItemText.find(Typography);
       assert.strictEqual(typography.exists(), true);
-      assert.strictEqual(typography.props().variant, 'subheading');
+      assert.strictEqual(typography.props().variant, 'body1');
       assert.strictEqual(wrapper.text(), 'This is the primary text');
     });
 
@@ -109,7 +109,7 @@ describe('<ListItemText />', () => {
       assert.strictEqual(texts.length, 2);
 
       const primaryText = texts.first();
-      assert.strictEqual(primaryText.props().variant, 'subheading');
+      assert.strictEqual(primaryText.props().variant, 'body1');
       assert.strictEqual(primaryText.text(), 'This is the primary text');
 
       const secondaryText = texts.last();
diff --git a/packages/material-ui/src/styles/createTypography.js b/packages/material-ui/src/styles/createTypography.js
index ee3422405cfe9a..45efa9b47c70ee 100644
--- a/packages/material-ui/src/styles/createTypography.js
+++ b/packages/material-ui/src/styles/createTypography.js
@@ -71,7 +71,7 @@ export default function createTypography(palette, typography) {
     subtitle2: buildVariant(fontWeightMedium, 14, 1.57, 0.1),
     body1Next: buildVariant(fontWeightRegular, 16, 1.5, 0.15),
     body2Next: buildVariant(fontWeightRegular, 14, 1.5, 0.15),
-    buttonNext: buildVariant(fontWeightMedium, 14, 1.5, 0.4, caseAllCaps),
+    buttonNext: buildVariant(fontWeightMedium, 14, 1.625, 0.4, caseAllCaps),
     captionNext: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
     overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
   };