Skip to content

Commit ceb8276

Browse files
[styles] Remove the old styles modules
1 parent 4a48c2f commit ceb8276

File tree

93 files changed

+412
-6883
lines changed

Some content is hidden

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

93 files changed

+412
-6883
lines changed

docs/scripts/buildApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import generateMarkdown from '../src/modules/utils/generateMarkdown';
88
import { findPagesMarkdown, findComponents } from '../src/modules/utils/find';
99
import { getHeaders } from '../src/modules/utils/parseMarkdown';
1010
import createMuiTheme from '../../packages/material-ui/src/styles/createMuiTheme';
11-
import getStylesCreator from '../../packages/material-ui/src/styles/getStylesCreator';
11+
import getStylesCreator from '../../packages/material-ui-styles/src/getStylesCreator';
1212

1313
function ensureExists(pat, mask, cb) {
1414
mkdir(pat, mask, err => {

docs/src/modules/components/AppWrapper.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { connect } from 'react-redux';
44
import url from 'url';
5-
import { MuiThemeProvider } from '@material-ui/core/styles';
6-
import { StylesProvider } from '@material-ui/styles';
5+
import { StylesProvider, ThemeProvider } from '@material-ui/styles';
76
import acceptLanguage from 'accept-language';
87
import { lightTheme, darkTheme, setPrismTheme } from '@material-ui/docs/MarkdownElement/prism';
98
import { updatePageContext } from 'docs/src/modules/styles/getPageContext';
@@ -186,7 +185,7 @@ class AppWrapper extends React.Component {
186185
sheetsManager={pageContext.sheetsManager}
187186
sheetsRegistry={pageContext.sheetsRegistry}
188187
>
189-
<MuiThemeProvider theme={pageContext.theme}>{children}</MuiThemeProvider>
188+
<ThemeProvider theme={pageContext.theme}>{children}</ThemeProvider>
190189
<SideEffects />
191190
</StylesProvider>
192191
);
-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
// Use the same helper as Babel to avoid bundle bloat.
22
import 'core-js/modules/es6.array.find-index';
33
import 'core-js/modules/es6.set';
4-
import { install } from '@material-ui/styles';
54

65
// Disable auto highlighting
76
// https://github.com/PrismJS/prism/issues/765
87
if (process.browser) {
98
window.Prism = window.Prism || {};
109
window.Prism.manual = true;
1110
}
12-
13-
install();
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
2-
import { MuiThemeProvider } from '@material-ui/core/styles';
2+
import { ThemeProvider } from '@material-ui/styles';
33

44
const withTheme = theme => Component => props => (
5-
<MuiThemeProvider theme={theme}>
5+
<ThemeProvider theme={theme}>
66
<Component {...props} />
7-
</MuiThemeProvider>
7+
</ThemeProvider>
88
);
99

1010
export default withTheme;

docs/src/pages/premium-themes/onepirate/modules/withRoot.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
2-
import { MuiThemeProvider } from '@material-ui/core/styles';
2+
import { ThemeProvider } from '@material-ui/styles';
33
import CssBaseline from '@material-ui/core/CssBaseline';
44
import theme from './theme';
55

66
function withRoot(Component) {
77
function WithRoot(props) {
8-
// MuiThemeProvider makes the theme available down the React tree thanks to React context.
8+
// ThemeProvider makes the theme available down the React tree thanks to React context.
99
return (
10-
<MuiThemeProvider theme={theme}>
10+
<ThemeProvider theme={theme}>
1111
{/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
1212
<CssBaseline />
1313
<Component {...props} />
14-
</MuiThemeProvider>
14+
</ThemeProvider>
1515
);
1616
}
1717

docs/src/pages/premium-themes/paperbase/Paperbase.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { MuiThemeProvider, createMuiTheme, withStyles } from '@material-ui/core/styles';
3+
import { createMuiTheme, withStyles } from '@material-ui/core/styles';
4+
import { ThemeProvider } from '@material-ui/styles';
45
import CssBaseline from '@material-ui/core/CssBaseline';
56
import Hidden from '@material-ui/core/Hidden';
67
import Navigator from './Navigator';
@@ -156,7 +157,7 @@ class Paperbase extends React.Component {
156157
const { classes } = this.props;
157158

158159
return (
159-
<MuiThemeProvider theme={theme}>
160+
<ThemeProvider theme={theme}>
160161
<div className={classes.root}>
161162
<CssBaseline />
162163
<nav className={classes.drawer}>
@@ -179,7 +180,7 @@ class Paperbase extends React.Component {
179180
</main>
180181
</div>
181182
</div>
182-
</MuiThemeProvider>
183+
</ThemeProvider>
183184
);
184185
}
185186
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
2-
import { MuiThemeProvider } from '@material-ui/core/styles';
2+
import { ThemeProvider } from '@material-ui/styles';
33

44
const withTheme = theme => Component => props => (
5-
<MuiThemeProvider theme={theme}>
5+
<ThemeProvider theme={theme}>
66
<Component {...props} />
7-
</MuiThemeProvider>
7+
</ThemeProvider>
88
);
99

1010
export default withTheme;

examples/create-react-app-with-flow/.flowconfig

-36
This file was deleted.

examples/create-react-app-with-flow/.gitignore

-23
This file was deleted.

examples/create-react-app-with-flow/README.md

-30
This file was deleted.

examples/create-react-app-with-flow/flow-typed/npm/flow-bin_v0.x.x.js

-6
This file was deleted.

examples/create-react-app-with-flow/flow-typed/npm/jss-preset-default_vx.x.x.js

-53
This file was deleted.

0 commit comments

Comments
 (0)