jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Upgrade to MUI 5 (#4606)

Browse source 
* save work

* fix perf issue on i18n rollup

* fix reset styling

* move body line-height from reset

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>
This commit is contained in:
Jeremy Letto 2022-10-29 20:17:03 -05:00 • committed by GitHub
parent 72743e834e
commit f619ef23fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 570 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

21
webclient/src/index.tsx
View file

@ -1,8 +1,8 @@
import { ThemeProvider } from '@material-ui/styles';
import { Theme, StyledEngineProvider } from '@mui/material';
import { ThemeProvider } from '@mui/material/styles';
import React from 'react';
import ReactDOM from 'react-dom';
import { AppShell } from 'containers';
import { materialTheme } from './material-theme';
@ -10,10 +10,17 @@ import './i18n';
import './index.css';
const appWithMaterialTheme = () => (
<ThemeProvider theme={materialTheme}>
<AppShell />
</ThemeProvider>
declare module '@mui/styles/defaultTheme' {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
interface DefaultTheme extends Theme {}
}
const AppWithMaterialTheme = () => (
<StyledEngineProvider injectFirst>
<ThemeProvider theme={materialTheme}>
<AppShell />
</ThemeProvider>
</StyledEngineProvider>
);
ReactDOM.render(appWithMaterialTheme(), document.getElementById('root'));
ReactDOM.render(<AppWithMaterialTheme />, document.getElementById('root'));