Skip to content

Commit

Permalink
Merge branch 'next' into pr/sperry94/15272
Browse files Browse the repository at this point in the history
  • Loading branch information
eps1lon committed Apr 11, 2019
2 parents ffc6f5e + 1d6425d commit 5c04e3c
Show file tree
Hide file tree
Showing 207 changed files with 2,639 additions and 1,668 deletions.
2 changes: 0 additions & 2 deletions BACKERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ via [OpenCollective](https://opencollective.com/material-ui)
<p style="display: flex; justify-content: center; flex-wrap: wrap;">
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="callemall" href="https://www.call-em-all.com" rel="noopener" target="_blank" style="margin-right: 16px;"><img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2Ff4053300-e0ea-11e7-acf0-0fa7c0509f4e.png&height=100" alt="callemall" title="The easy way to message your group"></a>
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="localize" href="https://localizejs.com" rel="noopener" target="_blank" style="margin-right: 16px;"><img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F629dea80-f1ae-11e8-b356-a5942970e22b.png&height=65" alt="localize" title="Application translation & localization platform"></a>
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="yakaz" href="https://yakaz.com" rel="noopener" target="_blank" style="margin-right: 16px;"><img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2Fb47b9630-1586-11e9-a4d4-47c0a7133bdc.png&height=80" alt="yakaz" title="Search classified ads"></a>
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="zinggrid" href="https://www.zinggrid.com/" rel="noopener" target="_blank" style="margin-right: 16px;"><img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F453226e0-258a-11e9-ac89-996ff9caccb7.png&height=45" alt="zinggrid" title="Makes powerful grids easy"></a>
</p>

## Silver Sponsors
Expand Down
8 changes: 1 addition & 7 deletions docs/src/modules/components/Head.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ import { connect } from 'react-redux';
import compose from 'docs/src/modules/utils/compose';

function Head(props) {
const {
t,
description = t('headDescription'),
router,
title = t('headTitle'),
userLanguage,
} = props;
const { t, description = t('strapline'), router, title = t('headTitle'), userLanguage } = props;

return (
<NextHead>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/HomeSteps.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function HomeSteps(props) {
className={classes.markdownElement}
text={`
\`\`\`html
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" />
\`\`\`
`}
/>
Expand Down
106 changes: 106 additions & 0 deletions docs/src/modules/components/HomeUsers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { withStyles } from '@material-ui/core/styles';
import NoSsr from '@material-ui/core/NoSsr';
import Grid from '@material-ui/core/Grid';
import Container from '@material-ui/core/Container';
import Button from '@material-ui/core/Button';
import Typography from '@material-ui/core/Typography';
import compose from 'docs/src/modules/utils/compose';

const users = [
{
logo: 'nasa.png',
caption: 'NASA',
},
{
logo: 'walmart-labs.png',
caption: 'Walmart Labs',
},
{
logo: 'capgemini.png',
caption: 'Capgemini',
},
{
logo: 'uniqlo.png',
caption: 'Uniqlo',
},
{
logo: 'bethesda.png',
caption: 'Bethesda',
},
];

const styles = theme => ({
root: {
padding: theme.spacing(2),
backgroundColor: theme.palette.background.paper,
minHeight: 160,
paddingTop: theme.spacing(5),
},
container: {
paddingTop: theme.spacing(14),
paddingBottom: theme.spacing(14),
borderTop: `1px solid ${theme.palette.divider}`,
},
grid: {
marginTop: theme.spacing(5),
marginBottom: theme.spacing(5),
},
img: {
margin: '12px 24px',
},
});

function HomeUsers(props) {
const { classes, t } = props;

return (
<div className={classes.root}>
<NoSsr>
<Container className={classes.container}>
<Typography variant="h4" align="center" gutterBottom>
{t('whosUsing')}
</Typography>
<Typography variant="body1" align="center" gutterBottom>
{t('joinThese')}
</Typography>
<Grid container justify="center" className={classes.grid}>
{users.map(user => (
<img
key={user.caption}
src={`/static/images/users/${user.logo}`}
alt={user.caption}
className={classes.img}
/>
))}
</Grid>
<Typography variant="body1" align="center" gutterBottom>
{t('usingMui')}
</Typography>
<Grid container justify="center">
<Button
variant="outlined"
href="https://spectrum.chat/material-ui/general/whos-using-material-ui~00e6687a-9b2d-454f-97a6-950d9fde71cf"
rel="noopener nofollow"
target="_blank"
>
{t('letUsKnow')}
</Button>
</Grid>
</Container>
</NoSsr>
</div>
);
}

HomeUsers.propTypes = {
classes: PropTypes.object.isRequired,
t: PropTypes.func.isRequired,
};

export default compose(
connect(state => ({ t: state.options.t })),
withStyles(styles),
)(HomeUsers);
8 changes: 1 addition & 7 deletions docs/src/modules/components/backers.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@ via [OpenCollective](https://opencollective.com/material-ui)
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="localize" href="https://localizejs.com" rel="noopener" target="_blank" style="margin-right: 16px;">
<img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F629dea80-f1ae-11e8-b356-a5942970e22b.png&height=65" alt="localize" title="Application translation & localization platform">
</a>
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="yakaz" href="https://yakaz.com" rel="noopener" target="_blank" style="margin-right: 16px;">
<img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2Fb47b9630-1586-11e9-a4d4-47c0a7133bdc.png&height=80" alt="yakaz" title="Search classified ads">
</a>
<a data-ga-event-category="sponsors" data-ga-event-action="logo" data-ga-event-label="zinggrid" href="https://www.zinggrid.com/" rel="noopener" target="_blank" style="margin-right: 16px;">
<img src="https://images.opencollective.com/proxy/images?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F453226e0-258a-11e9-ac89-996ff9caccb7.png&height=45" alt="zinggrid" title="Makes powerful grids easy">
</a>
</p>

### There is more!
### There are more!

See the full list of [our backers](/discover-more/backers/).
4 changes: 2 additions & 2 deletions docs/src/modules/utils/getDemoConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ export default function getDemo(demoData) {
'index.html': `
<body>
<!-- Fonts to support Material Design -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" />
<!-- Icons to support Material Design -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<div id="root"></div>
</body>
`,
Expand Down
Loading

0 comments on commit 5c04e3c

Please sign in to comment.