-
-
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 docs/demos-fix
- Loading branch information
Showing
68 changed files
with
2,485 additions
and
2,050 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,7 +1,7 @@ | ||
| version: 2.1 | ||
| orbs: | ||
| aws-cli: circleci/[email protected] | ||
| aws-s3: circleci/[email protected] | ||
| aws-s3: circleci/aws-s3@4.1.0 | ||
|
|
||
| parameters: | ||
| browserstack-force: | ||
|
|
@@ -380,7 +380,7 @@ jobs: | |
| <<: *default-job | ||
| resource_class: 'medium+' | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| steps: | ||
| - checkout | ||
| - install_js: | ||
|
|
@@ -408,7 +408,7 @@ jobs: | |
| test_e2e: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| steps: | ||
| - checkout | ||
| - install_js: | ||
|
|
@@ -420,7 +420,7 @@ jobs: | |
| # NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| steps: | ||
| - checkout | ||
| - install_js: | ||
|
|
@@ -433,7 +433,7 @@ jobs: | |
| test_profile: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| steps: | ||
| - checkout | ||
| - install_js: | ||
|
|
@@ -458,7 +458,7 @@ jobs: | |
| test_regressions: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| steps: | ||
| - checkout | ||
| - install_js: | ||
|
|
@@ -525,7 +525,7 @@ jobs: | |
| test_bundling_next_webpack4: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/ | ||
| steps: | ||
| - checkout: | ||
|
|
@@ -543,7 +543,7 @@ jobs: | |
| test_bundling_next_webpack5: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/ | ||
| steps: | ||
| - checkout: | ||
|
|
@@ -561,7 +561,7 @@ jobs: | |
| test_bundling_create_react_app: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/ | ||
| steps: | ||
| - checkout: | ||
|
|
@@ -579,7 +579,7 @@ jobs: | |
| test_bundling_snowpack: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/ | ||
| steps: | ||
| - checkout: | ||
|
|
@@ -597,7 +597,7 @@ jobs: | |
| test_bundling_vite: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/vite/ | ||
| steps: | ||
| - checkout: | ||
|
|
@@ -615,7 +615,7 @@ jobs: | |
| test_bundling_esbuild: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/ | ||
| steps: | ||
| - checkout: | ||
|
|
@@ -633,7 +633,7 @@ jobs: | |
| test_bundling_gatsby: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| environment: | ||
| GATSBY_CPU_COUNT: '3' | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/ | ||
|
|
@@ -734,7 +734,7 @@ jobs: | |
| test_benchmark: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.48.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.48.2-focal | ||
| steps: | ||
| - checkout | ||
| - install_js: | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import * as React from 'react'; | ||
| import Avatar from '@mui/material/Avatar'; | ||
| import AvatarGroup from '@mui/material/AvatarGroup'; | ||
| import Stack from '@mui/material/Stack'; | ||
|
|
||
| export default function Spacing() { | ||
| return ( | ||
| <Stack spacing={4}> | ||
| <AvatarGroup spacing="medium"> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| <AvatarGroup spacing="small"> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| <AvatarGroup spacing={24}> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| </Stack> | ||
| ); | ||
| } |
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,26 @@ | ||
| import * as React from 'react'; | ||
| import Avatar from '@mui/material/Avatar'; | ||
| import AvatarGroup from '@mui/material/AvatarGroup'; | ||
| import Stack from '@mui/material/Stack'; | ||
|
|
||
| export default function Spacing() { | ||
| return ( | ||
| <Stack spacing={4}> | ||
| <AvatarGroup spacing="medium"> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| <AvatarGroup spacing="small"> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| <AvatarGroup spacing={24}> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| </Stack> | ||
| ); | ||
| } |
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,15 @@ | ||
| <AvatarGroup spacing="medium"> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| <AvatarGroup spacing="small"> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> | ||
| <AvatarGroup spacing={24}> | ||
| <Avatar alt="Remy Sharp" src="/static/images/avatar/1.jpg" /> | ||
| <Avatar alt="Travis Howard" src="/static/images/avatar/2.jpg" /> | ||
| <Avatar alt="Cindy Baker" src="/static/images/avatar/3.jpg" /> | ||
| </AvatarGroup> |
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.