Skip to content

Commit

Permalink
Merge branch 'next' into feat/rename-packages
Browse files Browse the repository at this point in the history
  • Loading branch information
mnajdova committed Sep 1, 2021
2 parents b147887 + c3a0d12 commit 32d729a
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 18 deletions.
10 changes: 5 additions & 5 deletions docs/pages/branding/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ const teamMembers: Array<Profile> = [
title: 'Core components team',
location: 'Silesia, Poland',
country: 'pl',
about: 'Motorcyclist, gamer and coder (UI and more!)',
about: 'Motorcyclist, gamer, and coder (UI and more!)',
twitter: 'michaldudak',
github: 'michaldudak',
},
Expand Down Expand Up @@ -486,7 +486,7 @@ function AboutContent() {
We plan on doing all that cultivating our values:
</Typography>
{[
'Customer obsessession. We put our customers front & center.',
'Customer obsessed. We put our customers front & center.',
'Transparency. Most of our work is public.',
'Freedom. We work from anywhere in the world.',
'Autonomy. We want to create a safe, high-trust team.',
Expand Down Expand Up @@ -584,7 +584,7 @@ function AboutContent() {
</Typography>
<Typography color="text.secondary" sx={{ maxWidth: { md: 500 } }}>
We honor some no-longer-active core team members who have made valuable contributions
in the past. They advise us from time-to-time.
in the past. They advise us from time to time.
</Typography>
<Box sx={{ pt: 2 }}>
<Grid container spacing={2}>
Expand All @@ -611,8 +611,8 @@ function AboutContent() {
<Typography variant="body2" color="text.secondary" sx={{ mb: 1 }}>
Tell us what and where we can improve or share your happy moments with us! You can
also up or downvote any page on our documentation. <br />
<br /> And lastly, from time to time, we send our community a survey for a more
structured feedback, you&apos;re always invinted to participate to share you
<br /> And lastly, from time to time, we send our community a survey for more
structured feedback, you&apos;re always invited to participate to share your
thoughts.
</Typography>
<Link
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/branding/home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function Home() {
<BrandingProvider>
<Head
title="MUI: A popular React UI framework"
description="The ultimate solution for your UI. MUI provides a robust, customizible and accessible library of foundational and advanced components, enabling you to build your own design system and develop React applications faster."
description="The ultimate solution for your UI. MUI provides a robust, customizable, and accessible library of foundational and advanced components, enabling you to build your own design system and develop React applications faster."
/>
<NoSsr>
<NewsletterToast />
Expand Down
2 changes: 1 addition & 1 deletion docs/public/static/branding/pricing/volume-discount.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/src/components/home/DiamondSponsors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ const DIAMONDs = [
src: 'https://avatars3.githubusercontent.com/u/1287123?s=40',
srcSet: 'https://avatars3.githubusercontent.com/u/1287123?s=80 2x',
name: 'Octopus Deploy',
description: 'Repetable relayable deployments.',
description: 'Repeatable reliable deployments.',
href: 'https://octopus.com/',
},
{
src: 'https://avatars3.githubusercontent.com/u/8424863?s=40',
srcSet: 'https://avatars3.githubusercontent.com/u/8424863?s=80 2x',
name: 'Doit International',
description: 'Management platform for Google Clound and AWS.',
description: 'Management platform for Google Cloud and AWS.',
href: 'https://www.doit-intl.com/',
},
];
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/home/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default function Hero() {
The <GradientText>ultimate</GradientText> solution for your&nbsp;UI
</Typography>
<Typography color="text.secondary" sx={{ mb: 3, maxWidth: 500 }}>
MUI provides a robust, customizible and accessible library of foundational and advanced
MUI provides a robust, customizable, and accessible library of foundational and advanced
components, enabling you to build your own design system and develop React applications
faster.
</Typography>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/pricing/PricingTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const planInfo = {
premium: {
color: 'gold',
title: 'Premium',
description: 'Unlock all the most advances features including premium support.',
description: 'Unlock all the most advanced features including premium support.',
},
} as const;

Expand Down
6 changes: 3 additions & 3 deletions docs/src/components/pricing/WhatToExpect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function WhatToExpect() {
variant="body2"
sx={{ ml: 1 }}
>
Volumn discount
Volume discount
</Typography>
</Box>
<Typography variant="body2" color="text.secondary">
Expand Down Expand Up @@ -59,7 +59,7 @@ export default function WhatToExpect() {
</Typography>
</Box>
<Typography variant="body2" color="text.secondary">
With your purchase you are granted a license to use a version of the product in
With your purchase, you are granted a license to use a version of the product in
perpetuity. There are no further charges unless you choose to renew support and
maintenance to cover newer versions. Please note that while the use of the software is
perpetual, support and maintenance are not. We roll bug fixes, performance
Expand Down Expand Up @@ -104,7 +104,7 @@ export default function WhatToExpect() {
</Typography>
</Box>
<Typography variant="body2" color="text.secondary">
With your purchase you receive support and maintenance for one year. After this time,
With your purchase, you receive support and maintenance for one year. After this time,
you can continue to use your licensed versions in perpetuity, but will no longer be
able to update to the latest version.
</Typography>
Expand Down
4 changes: 2 additions & 2 deletions docs/src/modules/components/ApiPage.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable material-ui/no-hardcoded-labels, react/no-danger */
/* eslint-disable react/no-danger */
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
Expand Down Expand Up @@ -56,7 +56,7 @@ function PropsTable(props) {
<td align="left">
{propData.deprecated && (
<Alert severity="warning" sx={{ mb: 1, py: 0 }}>
<strong>Deprecated</strong>
<strong>{t('api-docs.deprecated')}</strong>
{propData.deprecationInfo && ' - '}
{propData.deprecationInfo && (
<span
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/material-icons/synonyms.js
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ const synonyms = {
SupervisedUserCircle: 'avatar human people person profile supervisor',
SupervisorAccount:
'administrator avatar human people person profile supervised user',
SurroundSound: 'audio circle speaker system volumn',
SurroundSound: 'audio circle speaker system volume',
SwapCalls: 'arrow',
SwapHoriz: 'arrows back direction horizontal',
SwapHorizontalCircle: 'arrows back direction',
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/discover-more/team/Team.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ some of whom have chosen to be featured below.`}
title="Community emeriti"
description={`We honor some no-longer-active core team members who have made
valuable contributions in the past.
They advise us from time-to-time.`}
They advise us from time to time.`}
members={emeriti}
{...props}
/>
Expand Down
1 change: 1 addition & 0 deletions docs/translations/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"cssComponent": "As a CSS utility, the {{name}} component also supports all <a href=\"/system/properties/\"><code>system</code></a> properties. You can use them as props directly on the component.",
"default": "Default",
"demos": "Demos",
"deprecated": "Deprecated",
"description": "Description",
"globalClass": "Global class",
"import": "Import",
Expand Down

0 comments on commit 32d729a

Please sign in to comment.