Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs-infra] Add stray design adjustments #40623

Merged
merged 19 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
You can try out Material UI's MD3 components as they're developed using the `@mui/material-next` package.

:::warning
The MD3 components are currently in alpha and subject to change.
The Material 3 components are currently in alpha and subject to change.
:::

## Supported components
Expand Down Expand Up @@ -44,11 +44,11 @@

</codeblock>

**Peer dependencies**
#### Peer dependencies

<!-- #react-peer-version -->

Please note that [react](https://www.npmjs.com/package/react) and [react-dom](https://www.npmjs.com/package/react-dom) are peer dependencies too:
Please note that [react](https://www.npmjs.com/package/react) and [react-dom](https://www.npmjs.com/package/react-dom) are peer dependencies, meaning you should ensure they are installed before installing the Material UI Next package.

Check failure on line 51 in docs/data/material/guides/material-3-components/material-3-components.md

View workflow job for this annotation

GitHub Actions / runner / vale

[vale] reported by reviewdog 🐶 [Blog.BrandName] Use a non-breaking space for brand name ('Material UI' instead of 'Material UI') Raw Output: {"message": "[Blog.BrandName] Use a non-breaking space for brand name ('Material UI' instead of 'Material UI')", "location": {"path": "docs/data/material/guides/material-3-components/material-3-components.md", "range": {"start": {"line": 51, "column": 210}}}, "severity": "ERROR"}
danilo-leal marked this conversation as resolved.
Show resolved Hide resolved

```json
"peerDependencies": {
Expand All @@ -57,7 +57,7 @@
},
```

**Roboto font**
#### Roboto font

Material UI uses the [Roboto](https://fonts.google.com/specimen/Roboto) font by default.
Add it to your project via Fontsource, or with the Google Fonts CDN.
Expand Down Expand Up @@ -129,5 +129,5 @@

## Stable release

The stable release of the MD3 components is tentatively targeted for Q4 2024 in Material UI v7.
To follow the progress or contribute to the project, check out the [Material 3 GitHub issue](https://github.com/mui/material-ui/issues/29345).
The stable release of the MD3 components is tentatively targeted for Q4 2024 in Material UI v7.

Check failure on line 132 in docs/data/material/guides/material-3-components/material-3-components.md

View workflow job for this annotation

GitHub Actions / runner / vale

[vale] reported by reviewdog 🐶 [Blog.BrandName] Use a non-breaking space for brand name ('Material UI' instead of 'Material UI') Raw Output: {"message": "[Blog.BrandName] Use a non-breaking space for brand name ('Material UI' instead of 'Material UI')", "location": {"path": "docs/data/material/guides/material-3-components/material-3-components.md", "range": {"start": {"line": 132, "column": 81}}}, "severity": "ERROR"}
To follow the progress or contribute to the project, check out [the Material 3 GitHub issue](https://github.com/mui/material-ui/issues/29345).
23 changes: 12 additions & 11 deletions docs/src/components/action/Highlighter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ export default function Highlighter({
...(selected && {
bgcolor: `${alpha(theme.palette.primary[50], 0.5)}`,
borderColor: 'primary.300',
boxShadow: `0px 1px 4px ${
(theme.vars || theme).palette.primary[200]
}, inset 0px 2px 4px ${alpha(theme.palette.primary[100], 0.5)}`,
boxShadow: `${alpha(theme.palette.primary[100], 0.4)} 0 -3px 1px inset, ${alpha(
theme.palette.primary[100],
0.3,
)} 0 2px 4px 0`,
color: 'primary.500',
}),
...(!selected && {
Expand All @@ -69,24 +70,24 @@ export default function Highlighter({
...theme.applyDarkStyles({
color: 'primary.800',
...((!disableBorder || selected) && {
borderColor: `${alpha(theme.palette.primaryDark[600], 0.3)}`,
borderColor: alpha(theme.palette.primaryDark[600], 0.3),
}),
...(!selected && {
'&:hover, &:focus': {
bgcolor: `${alpha(theme.palette.primary[800], 0.1)}`,
borderColor: `${alpha(theme.palette.primary[500], 0.3)}`,
bgcolor: alpha(theme.palette.primary[800], 0.1),
borderColor: alpha(theme.palette.primary[500], 0.3),
'@media (hover: none)': {
bgcolor: 'transparent',
},
},
}),
...(selected && {
bgcolor: `${alpha(theme.palette.primary[800], 0.3)}`,
borderColor: 'primary.700',
bgcolor: alpha(theme.palette.primary[800], 0.2),
borderColor: alpha(theme.palette.primary[700], 0.8),
color: 'primary.300',
boxShadow: `0px 1px 4px ${
(theme.vars || theme).palette.primary[900]
}, inset 0px 2px 4px ${(theme.vars || theme).palette.primaryDark[800]}`,
boxShadow: `${alpha(theme.palette.common.black, 0.5)} 0 -3px 1px inset, ${
theme.palette.common.black
} 0 2px 3px 0`,
}),
}),
'&.Mui-disabled': {
Expand Down
15 changes: 10 additions & 5 deletions docs/src/components/action/InfoCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { alpha } from '@mui/material/styles';
import Box from '@mui/material/Box';
import Paper from '@mui/material/Paper';
import Typography from '@mui/material/Typography';
Expand All @@ -22,13 +23,17 @@ export function GlowingIconContainer({ icon }: GlowingIconContainerProps) {
border: '1px solid',
borderColor: 'primary.200',
bgcolor: 'primary.50',
boxShadow:
'0px 1px 6px 0px rgba(194, 224, 255, 1), 0px 2px 30px 0px rgba(234, 237, 241, 0.3) inset',
boxShadow: `0px 1px 6px 0px ${alpha(
theme.palette.primary[500],
0.4,
)}, 0px 2px 30px 0px rgba(234, 237, 241, 0.3) inset`,
...theme.applyDarkStyles({
borderColor: 'primary.400',
borderColor: alpha(theme.palette.primary[400], 0.6),
bgcolor: 'primary.900',
boxShadow:
'0px 1px 6px 0px rgba(0, 89, 178, 1), 0px 2px 30px 0px rgba(0, 0, 0, 0.25) inset',
boxShadow: `0 2px 6px 0 ${alpha(
theme.palette.primary[600],
0.4,
)}, 0px 2px 30px 0px rgba(0, 0, 0, 0.25) inset`,
}),
})}
>
Expand Down
5 changes: 2 additions & 3 deletions docs/src/components/action/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export function Group({
{...props}
sx={{
maxWidth: rowLayout ? 'none' : { md: 500 },
overflow: 'auto',
display: { xs: 'grid', sm: rowLayout ? 'flex' : 'grid' },
justifyContent: { xs: 'start', sm: rowLayout ? 'center' : null },
gap: 1,
Expand Down Expand Up @@ -95,7 +94,7 @@ export default function Item({
<Box component="span" sx={{ mr: 2, lineHeight: 0 }}>
{icon}
</Box>
<span>
<Box sx={{ flexWrap: 'wrap' }}>
<Typography
component="span"
color="text.primary"
Expand All @@ -116,7 +115,7 @@ export default function Item({
{description}
</Typography>
)}
</span>
</Box>
</Box>
);
}
6 changes: 5 additions & 1 deletion docs/src/components/action/NpmCopyButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as React from 'react';
import copy from 'clipboard-copy';
import { SxProps } from '@mui/system';
import { styled, Theme } from '@mui/material/styles';
import { styled, alpha, Theme } from '@mui/material/styles';
import ContentCopyRounded from '@mui/icons-material/ContentCopyRounded';
import CheckRounded from '@mui/icons-material/CheckRounded';

Expand Down Expand Up @@ -55,6 +55,10 @@ const Button = styled('button')(({ theme }) => ({
'&:focus, &:hover svg': {
opacity: 1,
},
'&:focus-visible': {
outline: `3px solid ${alpha(theme.palette.primary[500], 0.5)}`,
outlineOffset: '2px',
},
}));

export default function NpmCopyButton(
Expand Down
63 changes: 25 additions & 38 deletions docs/src/components/footer/EmailSubscribe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import { SxProps } from '@mui/system';
import { Theme, styled, alpha } from '@mui/material/styles';
import Alert from '@mui/material/Alert';
import AlertTitle from '@mui/material/AlertTitle';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import FormLabel from '@mui/material/FormLabel';
Expand Down Expand Up @@ -56,34 +55,23 @@ export default function EmailSubscribe({ sx }: { sx?: SxProps<Theme> }) {
if (form.status === 'sent') {
return (
<Alert
icon={<CheckCircleRoundedIcon fontSize="small" />}
severity="success"
sx={[
(theme) => ({
maxWidth: { sm: 400 },
fontWeight: 'medium',
bgcolor: 'success.50',
border: '1px solid',
borderColor: 'success.200',
color: 'success.900',
...theme.applyDarkStyles({
bgcolor: 'primaryDark.700',
color: 'success.200',
bgcolor: alpha(theme.palette.success[700], 0.1),
borderColor: alpha(theme.palette.success[600], 0.3),
}),
}),
...(Array.isArray(sx) ? sx : [sx]),
]}
iconMapping={{
success: (
<CheckCircleRoundedIcon
fontSize="small"
sx={(theme: Theme) => ({
color: 'success.700',
...theme.applyDarkStyles({
color: 'success.600',
}),
})}
/>
),
}}
>
<AlertTitle sx={{ typography: 'body2', fontWeight: 700 }}>
Thanks for subscribing!
</AlertTitle>
Go to your email and open the <strong>confirmation email</strong> to confirm your
subscription.
</Alert>
Expand Down Expand Up @@ -117,47 +105,44 @@ export default function EmailSubscribe({ sx }: { sx?: SxProps<Theme> }) {
inputProps={{ required: true }}
sx={[
(theme) => ({
typography: 'body1',
flexGrow: 1,
minWidth: 220,
borderRadius: 1,
border: '1px solid',
bgcolor: '#fff',
borderColor: 'grey.200',
bgcolor: '#FFF',
boxShadow: `inset 0 1px 2px ${
(theme.vars || theme).palette.grey[50]
}, 0 1px 0.5px ${alpha(theme.palette.grey[100], 0.6)}`,
borderColor: 'grey.200',
typography: 'body2',
}, 0 2px .5px ${alpha(theme.palette.grey[100], 0.5)}`,
'&:hover': {
borderColor: 'grey.300',
boxShadow: `inset 0 1px 2px ${(theme.vars || theme).palette.grey[50]}, 0 1px 2px ${
(theme.vars || theme).palette.grey[100]
}`,
boxShadow: `inset 0 1px 2px ${(theme.vars || theme).palette.grey[100]}`,
},
[`&.${inputBaseClasses.focused}`]: {
boxShadow: `0 0 0 3px ${(theme.vars || theme).palette.primary[200]}`,
borderColor: 'primary.300',
borderColor: 'primary.500',
},
[`& .${inputBaseClasses.input}`]: {
borderRadius: `calc(${theme.shape.borderRadius}px - 1px)`,
borderRadius: theme.shape.borderRadius,
py: 1,
px: 1.5,
},
}),
(theme) =>
theme.applyDarkStyles({
bgcolor: 'primaryDark.800',
borderColor: alpha(theme.palette.primaryDark[600], 0.8),
boxShadow: `inset 0 1px 1px ${
(theme.vars || theme).palette.primaryDark[900]
}, 0 1px 0.5px ${(theme.vars || theme).palette.common.black}`,
borderColor: 'primaryDark.600',
}, 0 2px .5px ${(theme.vars || theme).palette.common.black}`,
'&:hover': {
borderColor: 'primaryDark.400',
boxShadow: `inset 0 1px 1px ${
(theme.vars || theme).palette.primaryDark[900]
}, 0 1px 2px ${(theme.vars || theme).palette.common.black}`,
borderColor: 'primaryDark.500',
boxShadow: `inset 0 1px 2px ${(theme.vars || theme).palette.common.black}`,
},
[`&.${inputBaseClasses.focused}`]: {
boxShadow: `0 0 0 3px ${(theme.vars || theme).palette.primary[800]}`,
borderColor: 'primary.600',
borderColor: 'primary.400',
},
}),
]}
Expand All @@ -169,9 +154,11 @@ export default function EmailSubscribe({ sx }: { sx?: SxProps<Theme> }) {
{form.status === 'failure' && (
<FormHelperText
sx={(theme) => ({
color: 'warning.800',
mt: 1,
fontWeight: 'semiBold',
color: 'error.700',
...theme.applyDarkStyles({
color: 'warning.500',
color: 'error.400',
}),
})}
>
Expand Down
10 changes: 2 additions & 8 deletions docs/src/components/header/HeaderNavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ const Navigation = styled('nav')(({ theme }) => [
},
},
'&:focus-visible': {
outline: 0,
color: (theme.vars || theme).palette.grey[900],
backgroundColor: (theme.vars || theme).palette.grey[50],
borderColor: (theme.vars || theme).palette.primary[300],
outline: `3px solid ${alpha(theme.palette.primary[500], 0.5)}`,
outlineOffset: '2px',
},
},
},
Expand All @@ -63,10 +61,6 @@ const Navigation = styled('nav')(({ theme }) => [
backgroundColor: alpha(theme.palette.primaryDark[700], 0.8),
borderColor: (theme.vars || theme).palette.divider,
},
'&:focus-visible': {
color: (theme.vars || theme).palette.primary[50],
backgroundColor: (theme.vars || theme).palette.primaryDark[600],
},
},
},
}),
Expand Down
6 changes: 3 additions & 3 deletions docs/src/components/header/HeaderNavDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,16 @@ export default function HeaderNavDropdown() {
top: 56,
left: 0,
right: 0,
boxShadow: `0px 4px 20px rgba(170, 180, 190, 0.3)`,
boxShadow: `0px 16px 20px rgba(170, 180, 190, 0.3)`,
...theme.applyDarkStyles({
boxShadow: '0px 4px 20px rgba(0, 0, 0, 0.8)',
boxShadow: '0px 16px 20px rgba(0, 0, 0, 0.8)',
}),
})}
>
<Box
sx={{
p: 2,
bgcolor: 'background.paper',
bgcolor: 'background.default',
maxHeight: 'calc(100vh - 56px)',
overflow: 'auto',
}}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/home/GetStartedButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default function GetStartedButtons(props: GetStartedButtonsProps) {
sx={{
display: 'flex',
flexWrap: { xs: 'wrap', md: 'nowrap' },
gap: 1.5,
'&& > *': {
minWidth: { xs: '100%', md: '0%' },
},
Expand All @@ -64,7 +65,6 @@ export default function GetStartedButtons(props: GetStartedButtonsProps) {
endIcon={<KeyboardArrowRightRounded />}
sx={{
flexShrink: 0,
mr: { xs: 0, md: 1.5 },
mb: { xs: 2, md: 0 },
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const buttonStyles = `

&:hover {
background: var(--muidocs-palette-primaryDark-800);
border-color: var(--muidocs-palette-primaryDark-500);
}
}
`;
Expand Down
1 change: 1 addition & 0 deletions docs/src/components/productMaterial/MaterialComponents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ export default function MaterialComponents() {
</CssVarsProvider>
</Frame.Demo>
<Frame.Info
data-mui-color-scheme="dark"
sx={{
minHeight: 180,
maxHeight: demo === 'Table' ? 260 : 'none',
Expand Down
6 changes: 3 additions & 3 deletions docs/src/layouts/HeroContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function HeroContainer(props: HeroContainerProps) {
sx={[
(theme) => ({
minWidth: '50vw',
minHeight: 500,
minHeight: { xs: 'auto', sm: 500 },
height: 'calc(100vh - 120px)',
maxHeight: { md: 700, xl: 850 },
borderBottomLeftRadius: 12,
Expand Down Expand Up @@ -94,7 +94,7 @@ export default function HeroContainer(props: HeroContainerProps) {
<Box sx={{ overflow: 'hidden' }}>
<Container
sx={{
minHeight: 500,
minHeight: { xs: 'auto', sm: 500 },
height: { md: 'calc(100vh - 120px)' },
maxHeight: { md: 700, xl: 850 },
transition: '0.3s',
Expand Down Expand Up @@ -139,7 +139,7 @@ export default function HeroContainer(props: HeroContainerProps) {
<Container
sx={{
pt: { xs: 8, sm: 0 },
minHeight: 500,
minHeight: { xs: 'auto', sm: 500 },
height: { md: 'calc(100vh - 120px)' },
maxHeight: { md: 700, xl: 850 },
transition: '0.3s',
Expand Down
Loading