-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into accordion-joy-classes
Showing
17 changed files
with
128 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
Broken links found by `yarn docs:link-check` that exist: | ||
|
||
- https://mui.com/blog/material-ui-v4-is-out/#premium-themes-store-✨ | ||
- https://mui.com/joy-ui/integrations/material-ui/ | ||
- https://mui.com/size-snapshot |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,22 @@ | ||
import * as React from 'react'; | ||
import Avatar from '@mui/joy/Avatar'; | ||
import Box from '@mui/joy/Box'; | ||
import Card from '@mui/joy/Card'; | ||
import Link from '@mui/joy/Link'; | ||
import Typography from '@mui/joy/Typography'; | ||
import CenterFocusWeak from '@mui/icons-material/CenterFocusWeak'; | ||
|
||
export default function LinkCard() { | ||
return ( | ||
<Card> | ||
<Box sx={{ display: 'flex', gap: 2, mb: 2 }}> | ||
<Avatar size="lg" src="/static/images/avatar/1.jpg" /> | ||
<div> | ||
{/* This could be a heading (eg. h2) depends on your use case. */} | ||
<Typography component="div"> | ||
<Link | ||
overlay | ||
href="#with-card" | ||
textColor="inherit" | ||
underline="none" | ||
fontWeight="md" | ||
> | ||
Joy UI | ||
</Link> | ||
</Typography> | ||
<Typography level="body-sm">Components that spark joy!</Typography> | ||
</div> | ||
</Box> | ||
<Typography level="body-sm" display="flex" alignItems="center" gap={0.5}> | ||
Click the <CenterFocusWeak /> and <kbd>TAB</kbd> to test the focus | ||
</Typography> | ||
<Card variant="outlined" sx={{ display: 'flex', gap: 2 }}> | ||
<Avatar size="lg" src="/static/images/avatar/1.jpg" /> | ||
<Link | ||
overlay | ||
href="#introduction" | ||
underline="none" | ||
sx={{ display: 'flex', flexDirection: 'column', alignItems: 'start' }} | ||
> | ||
<Typography level="body-md">Joy UI</Typography> | ||
<Typography level="body-sm">Components that spark joy!</Typography> | ||
</Link> | ||
</Card> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,22 @@ | ||
import * as React from 'react'; | ||
import Avatar from '@mui/joy/Avatar'; | ||
import Box from '@mui/joy/Box'; | ||
import Card from '@mui/joy/Card'; | ||
import Link from '@mui/joy/Link'; | ||
import Typography from '@mui/joy/Typography'; | ||
import CenterFocusWeak from '@mui/icons-material/CenterFocusWeak'; | ||
|
||
export default function LinkCard() { | ||
return ( | ||
<Card> | ||
<Box sx={{ display: 'flex', gap: 2, mb: 2 }}> | ||
<Avatar size="lg" src="/static/images/avatar/1.jpg" /> | ||
<div> | ||
{/* This could be a heading (eg. h2) depends on your use case. */} | ||
<Typography component="div"> | ||
<Link | ||
overlay | ||
href="#with-card" | ||
textColor="inherit" | ||
underline="none" | ||
fontWeight="md" | ||
> | ||
Joy UI | ||
</Link> | ||
</Typography> | ||
<Typography level="body-sm">Components that spark joy!</Typography> | ||
</div> | ||
</Box> | ||
<Typography level="body-sm" display="flex" alignItems="center" gap={0.5}> | ||
Click the <CenterFocusWeak /> and <kbd>TAB</kbd> to test the focus | ||
</Typography> | ||
<Card variant="outlined" sx={{ display: 'flex', gap: 2 }}> | ||
<Avatar size="lg" src="/static/images/avatar/1.jpg" /> | ||
<Link | ||
overlay | ||
href="#introduction" | ||
underline="none" | ||
sx={{ display: 'flex', flexDirection: 'column', alignItems: 'start' }} | ||
> | ||
<Typography level="body-md">Joy UI</Typography> | ||
<Typography level="body-sm">Components that spark joy!</Typography> | ||
</Link> | ||
</Card> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<Card variant="outlined" sx={{ display: 'flex', gap: 2 }}> | ||
<Avatar size="lg" src="/static/images/avatar/1.jpg" /> | ||
<Link | ||
overlay | ||
href="#introduction" | ||
underline="none" | ||
sx={{ display: 'flex', flexDirection: 'column', alignItems: 'start' }} | ||
> | ||
<Typography level="body-md">Joy UI</Typography> | ||
<Typography level="body-sm">Components that spark joy!</Typography> | ||
</Link> | ||
</Card> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.