Skip to content

Commit

Permalink
Merge branch 'master' into accordion-joy-classes
Browse files Browse the repository at this point in the history
  • Loading branch information
sai6855 committed Sep 5, 2023
2 parents 3205fac + 846bc16 commit 4126fc2
Show file tree
Hide file tree
Showing 284 changed files with 3,362 additions and 9,462 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10720,7 +10720,7 @@ A big thanks to the 20 contributors who made this release possible. Here are som
- [Avatar] Fix usage of srcset property (#23286) @matheuspiment
- [ClickAwayListener] Fix mounting behavior in Portals in React 17 (#23315) @eps1lon
- [core] Allow React 17 (#23311) @eps1lon
- [Icon] Fix translation, e.g Google Translate (#23237) @cbeltrangomez84
- [Icon] Fix translation, e.g. Google Translate (#23237) @cbeltrangomez84
- [LinearProgress] Fix Safari's bug during composition of different paint (#23293) @montogeek
- [Radio] Fix dot misalignment in Safari (#23239) @anasufana
- [styled-engine] Fix tagged template syntax with multiple expressions (#23269) @eps1lon
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.old.md
Original file line number Diff line number Diff line change
Expand Up @@ -5540,7 +5540,7 @@ you to add them up quickly in your head without having to worry about decimals.

- [docs] Fix search suggestions on dark mode (#13874) @rfbotto
- [docs] Add accessibility section to selection-controls with demo (#13896) @wyseguyonline
- [docs] Add support for multiple demo variants e.g JS or Hooks (#13873) @adeelibr
- [docs] Add support for multiple demo variants e.g. JS or Hooks (#13873) @adeelibr
- [docs] Remove the withRoot HOC (#13909) @oliviertassinari
- [docs] Add material-ui-pickers in pickers page (#13697) @dmtrKovalenko
- [docs] Continue #13806 and port back some fix from @system (#13917) @oliviertassinari
Expand Down
2 changes: 1 addition & 1 deletion apps/zero-runtime-vite-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ You can either run `yarn release:build` command to build all the packages, or yo
Make sure you have also run `yarn release:build` at least once because we also use `@mui/material` and `@mui/system` packages. On subsequent runs, you can only build the above 2 packages using -

```bash
yarn build:zero
yarn build
```

After building, you can run the project by changing into the directory and then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const StyledAutocompleteRoot = styled('div')(
padding-right: 5px;
overflow: hidden;
width: 320px;
&.focused {
border-color: ${blue[400]};
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[500] : blue[200]};
Expand Down Expand Up @@ -264,7 +264,7 @@ const StyledPopupIndicator = styled(Button)(
background-color: transparent;
align-self: center;
padding: 0 2px;
&:hover {
background-color: ${theme.palette.mode === 'dark' ? grey[700] : blue[100]};
cursor: pointer;
Expand All @@ -289,7 +289,7 @@ const StyledClearIndicator = styled(Button)(
background-color: transparent;
align-self: center;
padding: 0 2px;
&:hover {
background-color: ${theme.palette.mode === 'dark' ? grey[700] : blue[100]};
cursor: pointer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const StyledAutocompleteRoot = styled('div')(
padding-right: 5px;
overflow: hidden;
width: 320px;
&.focused {
border-color: ${blue[400]};
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[500] : blue[200]};
Expand Down Expand Up @@ -247,7 +247,7 @@ const StyledPopupIndicator = styled(Button)(
background-color: transparent;
align-self: center;
padding: 0 2px;
&:hover {
background-color: ${theme.palette.mode === 'dark' ? grey[700] : blue[100]};
cursor: pointer;
Expand All @@ -272,7 +272,7 @@ const StyledClearIndicator = styled(Button)(
background-color: transparent;
align-self: center;
padding: 0 2px;
&:hover {
background-color: ${theme.palette.mode === 'dark' ? grey[700] : blue[100]};
cursor: pointer;
Expand Down
4 changes: 2 additions & 2 deletions docs/data/base/components/button/UnstyledButtonCustom.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const CustomButtonRoot = styled(ButtonRoot)(
transition: all 800ms ease;
pointer-events: none;
}
& .bg {
stroke: var(--main-color);
stroke-width: 1;
Expand Down Expand Up @@ -86,7 +86,7 @@ const CustomButtonRoot = styled(ButtonRoot)(
outline-offset: 2px;
}
&.${buttonClasses.active} {
&.${buttonClasses.active} {
& .bg {
fill: var(--active-color);
transition: fill 300ms ease-out;
Expand Down
4 changes: 2 additions & 2 deletions docs/data/base/components/button/UnstyledButtonCustom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const CustomButtonRoot = styled(ButtonRoot)(
transition: all 800ms ease;
pointer-events: none;
}
& .bg {
stroke: var(--main-color);
stroke-width: 1;
Expand Down Expand Up @@ -87,7 +87,7 @@ const CustomButtonRoot = styled(ButtonRoot)(
outline-offset: 2px;
}
&.${buttonClasses.active} {
&.${buttonClasses.active} {
& .bg {
fill: var(--active-color);
transition: fill 300ms ease-out;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,11 @@ function Styles() {
.CustomButton:active:not(.${buttonClasses.disabled}) {
background-color: ${cyan[700]};
}
.${buttonClasses.disabled} {
opacity: 0.5;
cursor: not-allowed;
}
`}
</style>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,11 @@ function Styles() {
.CustomButton:active:not(.${buttonClasses.disabled}) {
background-color: ${cyan[700]};
}
.${buttonClasses.disabled} {
opacity: 0.5;
cursor: not-allowed;
}
`}
</style>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function BasicFormControl() {

const StyledInput = styled(Input)(
({ theme }) => `
.${inputClasses.input} {
width: 320px;
font-size: 0.875rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function BasicFormControl() {

const StyledInput = styled(Input)(
({ theme }) => `
.${inputClasses.input} {
width: 320px;
font-size: 0.875rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default function FormControlFunctionChild() {

const StyledInput = styled(Input)(
({ theme }) => `
display: inline-block;
.${inputClasses.input} {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default function FormControlFunctionChild() {

const StyledInput = styled(Input)(
({ theme }) => `
display: inline-block;
.${inputClasses.input} {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ function Styles() {
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 2px ${isDarkMode ? grey[900] : grey[50]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[500] : cyan[200]};
}
&:focus-visible {
outline: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ function Styles() {
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 2px ${isDarkMode ? grey[900] : grey[50]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[500] : cyan[200]};
}
&:focus-visible {
outline: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ function Styles() {
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 24px ${isDarkMode ? cyan[800] : cyan[100]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[600] : cyan[200]};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ function Styles() {
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 24px ${isDarkMode ? cyan[800] : cyan[100]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[600] : cyan[200]};
Expand Down
Loading

0 comments on commit 4126fc2

Please sign in to comment.