Skip to content
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
12 changes: 0 additions & 12 deletions docs/babel.config.js

This file was deleted.

24 changes: 14 additions & 10 deletions docs/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,22 @@ import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
import getProductInfoFromUrl from 'docs/src/modules/utils/getProductInfoFromUrl';
import { DocsProvider } from '@mui/docs/DocsProvider';
import { mapTranslations } from '@mui/docs/i18n';
import { Inter, Roboto } from 'next/font/google';
import * as config from '../config';

const inter = Inter({
weight: ['300', '400', '500', '600', '700'],
subsets: ['latin'],
});

const roboto = Roboto({
weight: ['300', '400', '500', '700'],
style: ['normal', 'italic'],
subsets: ['latin'],
});

export const fontClasses = `${inter.className} ${roboto.className}`;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically not being used, but I'm just replicating core _app.js for now


// Enable telemetry for internal purposes
muiXTelemetrySettings.enableTelemetry();
// Remove the license warning from demonstration purposes
Expand Down Expand Up @@ -299,13 +313,6 @@ function AppWrapper(props) {
};
}, [productId, productCategoryId, pageProps.userLanguage, router.pathname]);

let fonts = [];
if (pathnameToLanguage(router.asPath).canonicalAs.match(/onepirate/)) {
fonts = [
'https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@700&family=Work+Sans:wght@300;400&display=swap',
];
}

// Replicate change reverted in https://github.com/mui/material-ui/pull/35969/files#r1089572951
// Fixes playground styles in dark mode.
const ThemeWrapper = router.pathname.startsWith('/playground') ? React.Fragment : ThemeProvider;
Expand All @@ -314,9 +321,6 @@ function AppWrapper(props) {
<React.Fragment>
<NextHead>
<meta name="viewport" content="initial-scale=1, width=device-width" />
{fonts.map((font) => (
<link rel="stylesheet" href={font} key={font} />
))}
<meta name="mui:productId" content={productId} />
<meta name="mui:productCategoryId" content={productCategoryId} />
</NextHead>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@mui/internal-netlify-cache": "^0.0.2-canary.1",
"@mui/internal-test-utils": "catalog:",
"@mui/material": "catalog:",
"@mui/monorepo": "github:mui/material-ui#f6e2d525b5314855539aaa4ee785973aab5deca8",
"@mui/monorepo": "github:mui/material-ui#6da6eb206edf9a837671095bdaaab3685aae21f2",
"@mui/utils": "catalog:",
"@next/eslint-plugin-next": "15.5.6",
"@octokit/plugin-retry": "^8.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/internals/Flatbush.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export class Flatbush {
x,
y,
maxResults = Infinity,
maxDistSq?: number = Infinity,
maxDistSq: number = Infinity,
filterFn?: (index: number) => boolean,
sqDistFn = sqDist,
) {
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading