Skip to content

Commit 52da9f4

Browse files
rename headline in h
1 parent 0098db1 commit 52da9f4

File tree

87 files changed

+437
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+437
-481
lines changed

.size-limit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ module.exports = [
1616
name: 'The initial cost people pay for using one component',
1717
webpack: true,
1818
path: 'packages/material-ui/build/Paper/index.js',
19-
limit: '17.5 KB',
19+
limit: '18.5 KB',
2020
},
2121
{
2222
name: 'The size of all the modules of material-ui.',
2323
webpack: true,
2424
path: 'packages/material-ui/build/index.js',
25-
limit: '91.4 KB',
25+
limit: '92.4 KB',
2626
},
2727
{
2828
name: 'The main bundle of the docs',

docs/src/modules/components/Ad.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,14 @@ class Ad extends React.Component {
7272
if (adblock) {
7373
return (
7474
<Paper elevation={0} className={classes.paper}>
75-
<Typography gutterBottom>Like Material-UI?</Typography>
76-
<Typography gutterBottom>
75+
<Typography variant="body2" gutterBottom>
76+
Like Material-UI?
77+
</Typography>
78+
<Typography variant="body2" gutterBottom>
7779
{`If you don't mind tech-related ads, and want to support Open Source,
7880
please whitelist Material-UI in your ad blocker.`}
7981
</Typography>
80-
<Typography>
82+
<Typography variant="body2">
8183
Thank you!{' '}
8284
<span role="img" aria-label="Love">
8385
❤️

docs/src/modules/components/AppDrawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function AppDrawer(props, context) {
100100
<div className={classes.toolbarIe11}>
101101
<div className={classes.toolbar}>
102102
<Link className={classes.title} href="/" onClick={onClose}>
103-
<Typography variant="headline6" color="inherit">
103+
<Typography variant="h6" color="inherit">
104104
Material-UI
105105
</Typography>
106106
</Link>

docs/src/modules/components/AppFrame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class AppFrame extends React.Component {
144144
<MenuIcon />
145145
</IconButton>
146146
{title !== null && (
147-
<Typography className={classes.title} variant="headline6" color="inherit" noWrap>
147+
<Typography className={classes.title} variant="h6" color="inherit" noWrap>
148148
{title}
149149
</Typography>
150150
)}

docs/src/modules/components/AppSearch.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ const styles = theme => ({
8888
background: 'transparent',
8989
},
9090
'& .algolia-docsearch-suggestion--title': {
91-
...theme.typography.headline6,
91+
...theme.typography.h6,
9292
},
9393
'& .algolia-docsearch-suggestion--text': {
94-
...theme.typography.body1,
94+
...theme.typography.body2,
9595
},
9696
'& .ds-dropdown-menu': {
9797
boxShadow: theme.shadows[1],

docs/src/modules/components/HomeFooter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function HomeFooter(props) {
3333

3434
return (
3535
<footer className={classes.root}>
36-
<Typography variant="headline6" gutterBottom>
36+
<Typography variant="h6" gutterBottom>
3737
Quick Links
3838
</Typography>
3939
<Typography variant="subtitle1" component="div">

docs/src/modules/components/HomeSteps.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function HomeSteps(props) {
8787
<Grid item xs={12} md={4} className={classNames(classes.step, classes.leftStep)}>
8888
<div className={classes.stepTitle}>
8989
<FileDownloadIcon className={classes.stepIcon} />
90-
<Typography variant="headline6">Installation</Typography>
90+
<Typography variant="h6">Installation</Typography>
9191
</div>
9292
<div className={classes.stepBody}>
9393
<Typography variant="subtitle1" gutterBottom>
@@ -139,7 +139,7 @@ function HomeSteps(props) {
139139
<Grid item xs={12} md={4} className={classes.step}>
140140
<div className={classes.stepTitle}>
141141
<BuildIcon className={classes.stepIcon} />
142-
<Typography variant="headline6">Usage</Typography>
142+
<Typography variant="h6">Usage</Typography>
143143
</div>
144144
<div className={classes.stepBody}>
145145
<Typography variant="subtitle1" gutterBottom>
@@ -173,7 +173,7 @@ function HomeSteps(props) {
173173
<Grid item xs={12} md={4} className={classNames(classes.step, classes.rightStep)}>
174174
<div className={classes.stepTitle}>
175175
<WhatshotIcon className={classes.stepIcon} />
176-
<Typography variant="headline6">Premium Themes</Typography>
176+
<Typography variant="h6">Premium Themes</Typography>
177177
</div>
178178
<div className={classes.stepBody}>
179179
<Typography variant="subtitle1" gutterBottom>

docs/src/pages/customization/themes/DarkTheme.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ const theme = createMuiTheme({
66
palette: {
77
type: 'dark', // Switching the dark mode on is a single property value change.
88
},
9+
typography: {
10+
useNextVariants: true,
11+
},
912
});
1013

1114
function DarkTheme() {

docs/src/pages/customization/themes/FontSizeTheme.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const theme = createMuiTheme({
66
typography: {
77
// Tell Material-UI what the font-size on the html element is.
88
htmlFontSize: 10,
9+
useNextVariants: true,
910
},
1011
});
1112

docs/src/pages/customization/themes/TypographyTheme.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const styles = {
1212

1313
const theme = createMuiTheme({
1414
typography: {
15+
useNextVariants: true,
1516
// Use the system font instead of the default Roboto font.
1617
fontFamily: [
1718
'-apple-system',
@@ -29,7 +30,7 @@ const theme = createMuiTheme({
2930
body1: {
3031
fontWeight: 500,
3132
},
32-
subtitle: {
33+
subtitle1: {
3334
fontSize: 12,
3435
},
3536
button: {

0 commit comments

Comments
 (0)