Merge remote-tracking branch 'upstream/master' into add-sponsor

zanivan · Sep 27, 2024 · 1363490 · 1363490
2 parents 0054e77 + a0cf344
commit 1363490
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/docs/data/material/getting-started/templates/dashboard/Dashboard.js b/docs/data/material/getting-started/templates/dashboard/Dashboard.js
@@ -46,7 +46,7 @@ export default function Dashboard(props) {
             sx={{
               alignItems: 'center',
               mx: 3,
-              pb: 10,
+              pb: 5,
               mt: { xs: 8, md: 0 },
             }}
           >

diff --git a/docs/data/material/getting-started/templates/dashboard/Dashboard.tsx b/docs/data/material/getting-started/templates/dashboard/Dashboard.tsx
@@ -49,7 +49,7 @@ export default function Dashboard(props: { disableCustomTheme?: boolean }) {
             sx={{
               alignItems: 'center',
               mx: 3,
-              pb: 10,
+              pb: 5,
               mt: { xs: 8, md: 0 },
             }}
           >

diff --git a/docs/src/modules/sandbox/CodeSandbox.ts b/docs/src/modules/sandbox/CodeSandbox.ts
@@ -28,7 +28,7 @@ function openSandbox({ files, codeVariant, initialFile }: any) {
   addHiddenInput(
     form,
     'query',
-    `module=${initialFile}${initialFile.match(/(\.tsx|\.ts|\.js)$/) ? '' : extension}`,
+    `module=${initialFile}${initialFile.match(/(\.tsx|\.ts|\.js)$/) ? '' : extension}&fontsize=12`,
   );
   document.body.appendChild(form);
   form.submit();

diff --git a/packages/mui-material/src/Button/Button.js b/packages/mui-material/src/Button/Button.js
@@ -162,7 +162,7 @@ const ButtonRoot = styled(ButtonBase, {
           },
         },
         ...Object.entries(theme.palette)
-          .filter(createSimplePaletteValueFilter(['dark', 'contrastText']))
+          .filter(createSimplePaletteValueFilter())
           .map(([color]) => ({
             props: { color },
             style: {

diff --git a/packages/mui-material/src/Modal/ModalManager.ts b/packages/mui-material/src/Modal/ModalManager.ts
@@ -19,8 +19,8 @@ function isOverflowing(container: Element): boolean {
   return container.scrollHeight > container.clientHeight;
 }
 
-export function ariaHidden(element: Element, show: boolean): void {
-  if (show) {
+export function ariaHidden(element: Element, hide: boolean): void {
+  if (hide) {
     element.setAttribute('aria-hidden', 'true');
   } else {
     element.removeAttribute('aria-hidden');
@@ -61,15 +61,15 @@ function ariaHiddenSiblings(
   mountElement: Element,
   currentElement: Element,
   elementsToExclude: readonly Element[],
-  show: boolean,
+  hide: boolean,
 ): void {
   const blacklist = [mountElement, currentElement, ...elementsToExclude];
 
   [].forEach.call(container.children, (element: Element) => {
     const isNotExcludedElement = !blacklist.includes(element);
     const isNotForbiddenElement = !isAriaHiddenForbiddenOnElement(element);
     if (isNotExcludedElement && isNotForbiddenElement) {
-      ariaHidden(element, show);
+      ariaHidden(element, hide);
     }
   });
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ export default function Dashboard(props) { @@
                 sx={{
                   alignItems: 'center',
                   mx: 3,
-                  pb: 10,
+                  pb: 5,
                   mt: { xs: 8, md: 0 },
                 }}
               >
@@ Expand Down @@