Skip to content

Commit

Permalink
[docs] Batch of fixes (#16229)
Browse files Browse the repository at this point in the history
* [docs] Fix no results for 'spinners'

* [lab] Fix missing warning dependency

* [docs] Reduce the size of the demo icons

* fix /r/styles-instance-warning

* update versions

* Update README.md

Co-Authored-By: Aditya Shankar <49206592+aditya1906@users.noreply.github.com>

* fix redirection url

* Update docs/src/pages/components/progress/progress.md

Co-Authored-By: Josh Wooding <12938082+joshwooding@users.noreply.github.com>
  • Loading branch information
oliviertassinari and joshwooding committed Jun 15, 2019
1 parent 627da22 commit 564aed3
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ npm install @material-ui/core
yarn add @material-ui/core
```

**[v3.x](https://v3-9-0.material-ui.com/)** ([Migration From v3 to v4](https://material-ui.com/guides/migration-v3/))
**[v3.x](https://v3.material-ui.com/)** ([Migration from v3 to v4](https://material-ui.com/guides/migration-v3/))

**[v0.x](https://v0.material-ui.com/)** ([Migration to v1](https://material-ui.com/guides/migration-v0x/))

Expand Down
8 changes: 4 additions & 4 deletions docs/src/modules/components/Demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ function Demo(props) {
onClick={handleClickCodeOpen}
color={demoHovered ? 'primary' : 'default'}
>
<CodeIcon />
<CodeIcon fontSize="small" />
</IconButton>
</Tooltip>
<Tooltip
Expand All @@ -302,7 +302,7 @@ function Demo(props) {
target="_blank"
rel="noopener nofollow"
>
<GithubIcon />
<GithubIcon fontSize="small" />
</IconButton>
</Tooltip>
{demoOptions.hideEditButton ? null : (
Expand All @@ -317,7 +317,7 @@ function Demo(props) {
data-ga-event-action="codesandbox"
onClick={handleClickCodeSandbox}
>
<EditIcon />
<EditIcon fontSize="small" />
</IconButton>
</Tooltip>
)}
Expand All @@ -327,7 +327,7 @@ function Demo(props) {
aria-haspopup="true"
aria-label={t('seeMore')}
>
<MoreVertIcon />
<MoreVertIcon fontSize="small" />
</IconButton>
<Menu
id="demo-menu-more"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/progress/progress.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ components: CircularProgress, LinearProgress

# Progress

<p class="description">Progress indicators express an unspecified wait time or display the length of a process.</p>
<p class="description">Progress indicators commonly known as spinners, express an unspecified wait time or display the length of a process. The animation works with CSS, not JavaScript.</p>

[Progress indicators](https://material.io/design/components/progress-indicators.html) inform users about the status of ongoing processes, such as loading an app, submitting a form, or saving updates. They communicate an app’s state and indicate available actions, such as whether users can navigate away from the current screen.

Expand Down
20 changes: 11 additions & 9 deletions docs/src/pages/versions/StableVersions.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class StableVersions extends React.Component {
});
// Legacy documentation.
docs.push({
version: 'v0.20.1',
version: 'v0',
url: 'https://v0.material-ui.com',
});
docs = orderBy(docs, 'version', 'desc');
Expand Down Expand Up @@ -92,14 +92,16 @@ class StableVersions extends React.Component {
</Link>
</TableCell>
<TableCell>
<Link
variant="body2"
color="secondary"
rel="nofollow"
href={`${GITHUB_RELEASE_BASE_URL}${doc.version}`}
>
Release notes
</Link>
{doc.version.length === 6 ? (
<Link
variant="body2"
color="secondary"
rel="nofollow"
href={`${GITHUB_RELEASE_BASE_URL}${doc.version}`}
>
Release notes
</Link>
) : null}
</TableCell>
</TableRow>
))}
Expand Down
6 changes: 3 additions & 3 deletions docs/static/_redirects
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ https://material-ui.dev/* https://material-ui.com/:splat 301!
/premium-themes* https://themes.material-ui.com/ 301

# link shortener
/r/styles-instance-warning https://material-ui.com/getting-started/faq#i-have-several-instances-of-styles-on-the-page 307
/r/caveat-with-refs-guide https://material-ui.com/guides/composition/#caveat-with-refs 307
/r/pseudo-classes-guide https://material-ui.com/guides/composition/#caveat-with-refs 307
/r/styles-instance-warning /getting-started/faq/#i-have-several-instances-of-styles-on-the-page 302
/r/caveat-with-refs-guide /guides/composition/#caveat-with-refs 302
/r/pseudo-classes-guide /customization/components/#pseudo-classes 302

# Legacy
/v0.20.0 https://v0.material-ui.com/v0.20.0
Expand Down
3 changes: 2 additions & 1 deletion packages/material-ui-lab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"@material-ui/utils": "^4.1.0",
"clsx": "^1.0.2",
"keycode": "^2.1.9",
"prop-types": "^15.7.2"
"prop-types": "^15.7.2",
"warning": "^4.0.1"
},
"devDependencies": {},
"sideEffects": false,
Expand Down

0 comments on commit 564aed3

Please sign in to comment.