Skip to content

Commit

Permalink
Merge branch 'next' into docs-ratings
Browse files Browse the repository at this point in the history
  • Loading branch information
mbrookes authored Oct 19, 2020
2 parents 1df3b19 + 14b3302 commit c5fcae6
Show file tree
Hide file tree
Showing 33 changed files with 349 additions and 1,655 deletions.
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
"prismjs": "^1.17.1",
"prop-types": "^15.7.2",
"raw-loader": "^1.0.0",
"react": "^16.13.0",
"react": "^16.14.0",
"react-docgen": "^5.0.0-beta.1",
"react-dom": "^16.13.0",
"react-dom": "^16.14.0",
"react-draggable": "^4.0.3",
"react-final-form": "^6.3.0",
"react-is": "^16.13.0",
Expand Down
3 changes: 0 additions & 3 deletions docs/src/pages/components/buttons/ButtonSizes.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ const useStyles = makeStyles((theme) => ({
margin: {
margin: theme.spacing(1),
},
extendedIcon: {
marginRight: theme.spacing(1),
},
}));

export default function ButtonSizes() {
Expand Down
3 changes: 0 additions & 3 deletions docs/src/pages/components/buttons/ButtonSizes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ const useStyles = makeStyles((theme: Theme) =>
margin: {
margin: theme.spacing(1),
},
extendedIcon: {
marginRight: theme.spacing(1),
},
}),
);

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/steppers/steppers.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Vertical steppers are designed for narrow screen sizes. They are ideal for mobil

## Mobile stepper

This component implements a compact stepper suitable for a mobile device. IT has more limited functionality than the vertical stepper. See [mobile steps](https://material.io/archive/guidelines/components/steppers.html#steppers-types-of-steps) for its inspiration.
This component implements a compact stepper suitable for a mobile device. It has more limited functionality than the vertical stepper. See [mobile steps](https://material.io/archive/guidelines/components/steppers.html#steppers-types-of-steps) for its inspiration.

The mobile stepper supports three variants to display progress through the available steps: text, dots, and progress.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ You can find some example projects in the [GitHub repository](https://github.com
- [CDN](https://github.com/mui-org/material-ui/tree/next/examples/cdn)
- [Plain server-side](https://github.com/mui-org/material-ui/tree/next/examples/ssr)
- [Use styled-components as style engine](https://github.com/mui-org/material-ui/tree/next/examples/create-react-app-with-styled-components)
- [Reason React](https://github.com/mui-org/material-ui/tree/next/examples/reason)

Create React App is an awesome project for learning React.
Have a look at [the alternatives available](https://github.com/facebook/create-react-app/blob/master/README.md#popular-alternatives) to see which project best fits your needs.
Expand Down
8 changes: 4 additions & 4 deletions examples/cdn/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1, width=device-width" />
<script src="https://unpkg.com/react@latest/umd/react.development.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/react-dom@latest/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/@material-ui/core@latest/umd/material-ui.development.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/@material-ui/core@next/umd/material-ui.development.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/babel-standalone@latest/babel.min.js" crossorigin="anonymous"></script>
<!-- Fonts to support Material Design -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
Expand Down Expand Up @@ -95,13 +95,13 @@
function App() {
return (
<Container maxWidth="sm">
<div style={{ marginTop: 24, }}>
<Box my={4}>
<Typography variant="h4" component="h1" gutterBottom>
CDN v4-beta example
CDN v5-alpha example
</Typography>
<ProTip />
<Copyright />
</div>
</Box>
</Container>
);
}
Expand Down
2 changes: 1 addition & 1 deletion examples/cdn/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cdn",
"version": "4.0.0",
"version": "5.0.0",
"private": true,
"dependencies": {},
"scripts": {}
Expand Down
8 changes: 8 additions & 0 deletions examples/preact/config-overrides.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const { addWebpackAlias, override } = require('customize-cra');

module.exports = override(
addWebpackAlias({
react: 'preact/compat',
'react-dom': 'preact/compat',
}),
);
91 changes: 0 additions & 91 deletions examples/preact/config/env.js

This file was deleted.

14 changes: 0 additions & 14 deletions examples/preact/config/jest/cssTransform.js

This file was deleted.

31 changes: 0 additions & 31 deletions examples/preact/config/jest/fileTransform.js

This file was deleted.

85 changes: 0 additions & 85 deletions examples/preact/config/paths.js

This file was deleted.

Loading

0 comments on commit c5fcae6

Please sign in to comment.