Skip to content

Commit

Permalink
[docs] Keep working on the SEO issues (#13158)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Oct 8, 2018
1 parent d6e02a0 commit a308ba5
Show file tree
Hide file tree
Showing 18 changed files with 78 additions and 62 deletions.
8 changes: 4 additions & 4 deletions BACKERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ via [Patreon](https://www.patreon.com/oliviertassinari)

via [OpenCollective](https://opencollective.com/material-ui)

<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/gold-sponsors.svg?avatarHeight=80&width=600"></object>
<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/gold-sponsors.svg?avatarHeight=80&width=600">Gold Sponsors</object>

## Silver Sponsors

Expand All @@ -35,7 +35,7 @@ via [Patreon](https://www.patreon.com/oliviertassinari)

via [OpenCollective](https://opencollective.com/material-ui)

<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/silver-sponsors.svg?avatarHeight=70&width=600"></object>
<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/silver-sponsors.svg?avatarHeight=70&width=600">Silver Sponsors</object>

## Bronze Sponsors

Expand All @@ -45,7 +45,7 @@ via [Patreon](https://www.patreon.com/oliviertassinari)

via [OpenCollective](https://opencollective.com/material-ui)

<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/bronze-sponsors.svg?avatarHeight=60&width=600"></object>
<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/bronze-sponsors.svg?avatarHeight=60&width=600">Bronze Sponsors</object>

## Backers

Expand All @@ -65,7 +65,7 @@ via [Patreon](https://www.patreon.com/oliviertassinari)

via [OpenCollective](https://opencollective.com/material-ui)

<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/backer.svg?avatarHeight=50&width=600"></object>
<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/backer.svg?avatarHeight=50&width=600">Backers</object>

## Why?

Expand Down
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ are aimed to [increase the sustainability of our organization](https://medium.co

In addition to their participation as a committer, Core Team members have the following privileges.
- Ability to [publish a release](https://github.com/mui-org/material-ui/releases).
- Access to Material-UI's [Twitter](https://twitter.com/i/notifications) and Medium account.
- Access to Material-UI's [Twitter](https://twitter.com/MaterialUI) and Medium account.
- Owner access to [mui-org on GitHub](https://github.com/mui-org).
- Admin access to various tools and services ([npm](https://www.npmjs.com/package/@material-ui/core),
[CircleCi](https://circleci.com/gh/mui-org/material-ui),
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ import Button from '@material-ui/core/Button';

function App() {
return (
<Button variant="raised" color="primary">
<Button variant="contained" color="primary">
Hello World
</Button>
);
Expand Down
1 change: 1 addition & 0 deletions docs/_redirects
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Legacy
/v0.20.0 https://v0.material-ui.com/v0.20.0
/v0.19.4 https://v0.material-ui.com/v0.19.4
/v0.19.3 https://v0.material-ui.com/v0.19.3
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/Carbon.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const styles = theme => ({
display: 'block',
},
'& .carbon-text': {
...theme.typography.body1,
...theme.typography.body2,
display: 'block',
margin: `${theme.spacing.unit}px 0`,
},
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/CodeFund.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const styles = theme => ({
display: 'block',
},
'&& .cf-text': {
...theme.typography.body1,
...theme.typography.body2,
display: 'block',
margin: `${theme.spacing.unit}px 0`,
'& strong': {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/HomeBackers.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ via [Patreon](https://www.patreon.com/oliviertassinari)
via [OpenCollective](https://opencollective.com/material-ui)
<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/gold-sponsors.svg?avatarHeight=80&width=600"></object>
<object type="image/svg+xml" data="https://opencollective.com/material-ui/tiers/gold-sponsors.svg?avatarHeight=80&width=600">Gold Sponsors</object>
### There is more!
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/MarkdownDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const styles = theme => ({
});

const demoRegexp = /^"demo": "(.*)"/;
const SOURCE_CODE_ROOT_URL = 'https://github.com/mui-org/material-ui/tree/master';
const SOURCE_CODE_ROOT_URL = 'https://github.com/mui-org/material-ui/blob/master';

function MarkdownDocs(props, context) {
const { classes, demos, disableAd, markdown, markdownLocation: markdownLocationProp } = props;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class DynamicThemeNesting extends React.Component {
: defaultTheme
}
>
<Button variant="raised" color="secondary">
<Button variant="contained" color="secondary">
{'Theme nesting'}
</Button>
</MuiThemeProvider>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/page-layout-examples/blog/Blog.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function Blog(props) {
<Grid container>
<Grid item md={6}>
<div className={classes.mainFeaturedPostContent}>
<Typography variant="h3" color="inherit" gutterBottom>
<Typography component="h1" variant="h3" color="inherit" gutterBottom>
Title of a longer featured blog post
</Typography>
<Typography variant="h5" color="inherit" paragraph>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/page-layout-examples/checkout/Checkout.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class Checkout extends React.Component {
</AppBar>
<main className={classes.layout}>
<Paper className={classes.paper}>
<Typography variant="h4" align="center">
<Typography component="h1" variant="h4" align="center">
Checkout
</Typography>
<Stepper activeStep={activeStep} className={classes.stepper}>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/page-layout-examples/pricing/Pricing.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function Pricing(props) {
<main className={classes.layout}>
{/* Hero unit */}
<div className={classes.heroContent}>
<Typography variant="h2" align="center" color="textPrimary" gutterBottom>
<Typography component="h1" variant="h2" align="center" color="textPrimary" gutterBottom>
Pricing
</Typography>
<Typography variant="h6" align="center" color="textSecondary" component="p">
Expand Down
6 changes: 4 additions & 2 deletions docs/src/pages/page-layout-examples/sign-in/SignIn.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ function SignIn(props) {
<Avatar className={classes.avatar}>
<LockIcon />
</Avatar>
<Typography variant="h5">Sign in</Typography>
<Typography component="h1" variant="h5">
Sign in
</Typography>
<form className={classes.form}>
<FormControl margin="normal" required fullWidth>
<InputLabel htmlFor="email">Email Address</InputLabel>
Expand All @@ -78,7 +80,7 @@ function SignIn(props) {
<Button
type="submit"
fullWidth
variant="raised"
variant="contained"
color="primary"
className={classes.submit}
>
Expand Down
2 changes: 1 addition & 1 deletion examples/cdn/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<Typography variant="subtitle1" gutterBottom>
example project
</Typography>
<Button variant="raised" color="secondary" onClick={this.handleClick}>
<Button variant="contained" color="secondary" onClick={this.handleClick}>
<Icon className={classes.icon}>fingerprint</Icon>
Super Secret Password
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class Index extends React.Component<WithStyles<typeof styles>, State> {
<Typography variant="subtitle1" gutterBottom>
example project
</Typography>
<Button variant="raised" color="secondary" onClick={this.handleClick}>
<Button variant="contained" color="secondary" onClick={this.handleClick}>
Super Secret Password
</Button>
</div>
Expand Down
93 changes: 53 additions & 40 deletions packages/material-ui/src/Button/Button.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { assert } from 'chai';
import { mock } from 'sinon';
import { createShallow, createRender, getClasses } from '../test-utils';
import Button from './Button';
import ButtonBase from '../ButtonBase';
Expand Down Expand Up @@ -104,48 +105,60 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), true);
});

it('should render a raised button', () => {
const wrapper = shallow(<Button variant="raised">Hello World</Button>);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedSecondary), false);
});
describe('raised legacy', () => {
let warning;

it('should render a raised primary button', () => {
const wrapper = shallow(
<Button variant="raised" color="primary">
Hello World
</Button>,
);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedSecondary), false);
});
beforeEach(() => {
warning = mock(console).expects('error');
});

it('should render a raised secondary button', () => {
const wrapper = shallow(
<Button variant="raised" color="secondary">
Hello World
</Button>,
);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), true);
assert.strictEqual(wrapper.hasClass(classes.raisedSecondary), true);
afterEach(() => {
warning.restore();
});

it('should render a raised button', () => {
const wrapper = shallow(<Button variant="raised">Hello World</Button>);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedSecondary), false);
});

it('should render a raised primary button', () => {
const wrapper = shallow(
<Button variant="raised" color="primary">
Hello World
</Button>,
);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedSecondary), false);
});

it('should render a raised secondary button', () => {
const wrapper = shallow(
<Button variant="raised" color="secondary">
Hello World
</Button>,
);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), true);
assert.strictEqual(wrapper.hasClass(classes.raisedSecondary), true);
});
});

it('should render an outlined button', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/test/typescript/components.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const ButtonTest = () => (
<Button disabled>Disabled</Button>
<Button href="#flat-buttons">Link</Button>
<Button size="small">Small</Button>
<Button variant="raised">Raised</Button>
<Button variant="contained">Contained</Button>
<Button variant="fab" color="primary" aria-label="add">
<FakeIcon />
</Button>
Expand Down
6 changes: 3 additions & 3 deletions test/regressions/tests/Button/MaterialV1Buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import Button from '@material-ui/core/Button';
export default function MaterialV1Buttons() {
return (
<div>
<Button variant="flat">Text</Button>
<Button variant="flat">Flat</Button>
<Button variant="flat" color="primary">
Text
Flat
</Button>
<Button variant="flat" color="secondary">
Text
Flat
</Button>
<Button variant="raised">Raised</Button>
<Button variant="raised" color="primary">
Expand Down

0 comments on commit a308ba5

Please sign in to comment.