From e87e153e92ae0822e8ea6aa9f7e86ac857c9603b Mon Sep 17 00:00:00 2001 From: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> Date: Fri, 31 May 2024 14:55:21 -0700 Subject: [PATCH] Ir 2392 MUI regression (#10301) * Fix regressions with mui styles * add todo --- packages/client/src/main.tsx | 1 + packages/client/src/pages/_app.tsx | 2 -- packages/editor/src/components/EditorContainer.tsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/client/src/main.tsx b/packages/client/src/main.tsx index 379a3c0a0a..09cb4dddd6 100755 --- a/packages/client/src/main.tsx +++ b/packages/client/src/main.tsx @@ -33,6 +33,7 @@ import { BrowserRouter, history } from '@etherealengine/client-core/src/common/s import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle' import './pages/styles.scss' +import './pages/mui.styles.scss' /** @todo Remove when MUI is removed */ // tslint:disable:ordered-imports // @ts-ignore ;(globalThis as any).process = { env: { ...(import.meta as any).env, APP_ENV: (import.meta as any).env.MODE } } diff --git a/packages/client/src/pages/_app.tsx b/packages/client/src/pages/_app.tsx index c0625d1bb8..a36106bda1 100755 --- a/packages/client/src/pages/_app.tsx +++ b/packages/client/src/pages/_app.tsx @@ -47,8 +47,6 @@ import { loadWebappInjection } from '@etherealengine/projects/loadWebappInjectio import RouterComp from '../route/public' import { ThemeContextProvider } from './themeContext' -import './mui.styles.scss' - declare module '@mui/styles/defaultTheme' { // eslint-disable-next-line @typescript-eslint/no-empty-interface interface DefaultTheme extends Theme {} diff --git a/packages/editor/src/components/EditorContainer.tsx b/packages/editor/src/components/EditorContainer.tsx index 7ea9c34e12..0e0a936529 100755 --- a/packages/editor/src/components/EditorContainer.tsx +++ b/packages/editor/src/components/EditorContainer.tsx @@ -442,7 +442,7 @@ const EditorContainer = () => {