Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Fix regression broken ad on Joy #35330

Draft
wants to merge 2 commits into
base: v5.x
Choose a base branch
from
Draft

[core] Fix regression broken ad on Joy #35330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ccd13c
[core] Fix regression broken ad on Joy
oliviertassinari Dec 4, 2022
dfaf316
alternative solution
oliviertassinari Dec 4, 2022
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
11 changes: 4 additions & 7 deletions docs/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import systemPages from 'docs/data/system/pages';
import PageContext from 'docs/src/modules/components/PageContext';
import GoogleAnalytics from 'docs/src/modules/components/GoogleAnalytics';
import { CodeCopyProvider } from 'docs/src/modules/utils/CodeCopy';
import { ThemeProvider } from 'docs/src/modules/components/ThemeContext';
import { CodeVariantProvider } from 'docs/src/modules/utils/codeVariant';
import { UserLanguageProvider } from 'docs/src/modules/utils/i18n';
import DocsStyledEngineProvider from 'docs/src/modules/utils/StyledEngineProvider';
Expand Down Expand Up @@ -179,12 +178,10 @@ function AppWrapper(props) {
<CodeCopyProvider>
<CodeVariantProvider>
<PageContext.Provider value={pageContextValue}>
<ThemeProvider>
<DocsStyledEngineProvider cacheLtr={emotionCache}>
{children}
<GoogleAnalytics />
</DocsStyledEngineProvider>
</ThemeProvider>
<DocsStyledEngineProvider cacheLtr={emotionCache}>
{children}
<GoogleAnalytics />
</DocsStyledEngineProvider>
</PageContext.Provider>
</CodeVariantProvider>
</CodeCopyProvider>
Expand Down
27 changes: 15 additions & 12 deletions docs/pages/about.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import IconImage from 'docs/src/components/icon/IconImage';
import ForumRoundedIcon from '@mui/icons-material/ForumRounded';
import PeopleRoundedIcon from '@mui/icons-material/PeopleRounded';
import LocalAtmRoundedIcon from '@mui/icons-material/LocalAtmRounded';
import { ThemeProvider } from 'docs/src/modules/components/ThemeContext';
import BrandingCssVarsProvider from 'docs/src/BrandingCssVarsProvider';
import AppHeaderBanner from 'docs/src/components/banner/AppHeaderBanner';

Expand Down Expand Up @@ -848,17 +849,19 @@ function AboutContent() {

export default function About() {
return (
<BrandingCssVarsProvider>
<Head
title="About us - MUI"
description="Our mission is to empower anyone to build UIs, faster. We're reducing the entry barrier, making design skills accessible."
/>
<AppHeaderBanner />
<AppHeader />
<main id="main-content">
<AboutContent />
</main>
<AppFooter />
</BrandingCssVarsProvider>
<ThemeProvider>
<BrandingCssVarsProvider>
Comment on lines +852 to +853
Copy link
Member

Choose a reason for hiding this comment

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

Seems like we can now merge these two components into one, to ease up the implementation. They are used together everywhere.

<Head
title="About us - MUI"
description="Our mission is to empower anyone to build UIs, faster. We're reducing the entry barrier, making design skills accessible."
/>
<AppHeaderBanner />
<AppHeader />
<main id="main-content">
<AboutContent />
</main>
<AppFooter />
</BrandingCssVarsProvider>
</ThemeProvider>
);
}
Loading