gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-19 00:06:01 -08:00
Code Issues Packages Projects Releases Wiki Activity

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
46 changed files with 570 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import IconButton from '@mui/material/IconButton';
import CloseIcon from '@mui/icons-material/Close';
import Typography from '@mui/material/Typography';
import { useTranslation } from 'react-i18next';
import { AccountActivationForm } from 'forms';
@@ -20,11 +20,11 @@ const AccountActivationDialog = ({ classes, handleClose, isOpen, onSubmit }: any
return (
<Dialog onClose={handleOnClose} open={isOpen}>
<DialogTitle disableTypography className="dialog-title">
<DialogTitle className="dialog-title">
<Typography variant="h6">{ t('AccountActivationDialog.title') }</Typography>
{handleOnClose ? (
<IconButton onClick={handleOnClose}>
<IconButton onClick={handleOnClose} size="large">
<CloseIcon />
</IconButton>
) : null}

16
webclient/src/dialogs/CardImportDialog/CardImportDialog.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import IconButton from '@mui/material/IconButton';
import CloseIcon from '@mui/icons-material/Close';
import Typography from '@mui/material/Typography';
import { CardImportForm } from 'forms';
@@ -17,11 +17,11 @@ const CardImportDialog = ({ classes, handleClose, isOpen }: any) => {
return (
<Dialog onClose={handleOnClose} open={isOpen}>
<DialogTitle disableTypography className="dialog-title">
<DialogTitle className="dialog-title">
<Typography variant="h2">Import Cards</Typography>
{handleOnClose ? (
<IconButton onClick={handleOnClose}>
<IconButton onClick={handleOnClose} size="large">
<CloseIcon />
</IconButton>
) : null}

20
webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
View File

@@ -1,12 +1,12 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import IconButton from '@material-ui/core/IconButton';
import { makeStyles } from '@material-ui/core/styles';
import AddIcon from '@material-ui/icons/Add';
import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import IconButton from '@mui/material/IconButton';
import makeStyles from '@mui/styles/makeStyles';
import AddIcon from '@mui/icons-material/Add';
import CloseIcon from '@mui/icons-material/Close';
import Typography from '@mui/material/Typography';
import { useTranslation } from 'react-i18next';
import { KnownHostForm } from 'forms';
@@ -35,12 +35,12 @@ const KnownHostDialog = ({ handleClose, onRemove, onSubmit, isOpen, host }: any)
return (
<Dialog className={'KnownHostDialog ' + classes.root} onClose={handleOnClose} open={isOpen}>
<DialogTitle disableTypography className='dialog-title'>
<DialogTitle className='dialog-title'>
<div className='dialog-title__wrapper'>
<Typography variant='h2'>{ t('KnownHostDialog.title', { mode }) }</Typography>
{handleClose ? (
<IconButton onClick={handleClose}>
<IconButton onClick={handleClose} size="large">
<CloseIcon fontSize='large' />
</IconButton>
) : null}

16
webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import IconButton from '@mui/material/IconButton';
import CloseIcon from '@mui/icons-material/Close';
import Typography from '@mui/material/Typography';
import { useTranslation } from 'react-i18next';
import { RegisterForm } from 'forms';
@@ -20,11 +20,11 @@ const RegistrationDialog = ({ classes, handleClose, isOpen, onSubmit }: any) =>
return (
<Dialog className="RegistrationDialog" onClose={handleOnClose} open={isOpen} maxWidth='xl'>
<DialogTitle disableTypography className="dialog-title">
<DialogTitle className="dialog-title">
<Typography variant="h6">{ t('RegistrationDialog.title') }</Typography>
{handleOnClose ? (
<IconButton onClick={handleOnClose}>
<IconButton onClick={handleOnClose} size="large">
<CloseIcon />
</IconButton>
) : null}

16
webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import IconButton from '@mui/material/IconButton';
import CloseIcon from '@mui/icons-material/Close';
import Typography from '@mui/material/Typography';
import { useTranslation } from 'react-i18next';
import { RequestPasswordResetForm } from 'forms';
@@ -20,11 +20,11 @@ const RequestPasswordResetDialog = ({ classes, handleClose, isOpen, onSubmit, sk
return (
<Dialog onClose={handleOnClose} open={isOpen}>
<DialogTitle disableTypography className="dialog-title">
<DialogTitle className="dialog-title">
<Typography variant="h6">{ t('RequestPasswordResetDialog.title') }</Typography>
{handleOnClose ? (
<IconButton onClick={handleOnClose}>
<IconButton onClick={handleOnClose} size="large">
<CloseIcon />
</IconButton>
) : null}

16
webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogContent from '@material-ui/core/DialogContent';
import DialogTitle from '@material-ui/core/DialogTitle';
import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close';
import Typography from '@material-ui/core/Typography';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import IconButton from '@mui/material/IconButton';
import CloseIcon from '@mui/icons-material/Close';
import Typography from '@mui/material/Typography';
import { useTranslation } from 'react-i18next';
import { ResetPasswordForm } from 'forms';
@@ -20,11 +20,11 @@ const ResetPasswordDialog = ({ classes, handleClose, isOpen, onSubmit, userName
return (
<Dialog onClose={handleOnClose} open={isOpen}>
<DialogTitle disableTypography className="dialog-title">
<DialogTitle className="dialog-title">
<Typography variant="h6">{t('ResetPasswordDialog.title')}</Typography>
{handleOnClose ? (
<IconButton onClick={handleOnClose}>
<IconButton onClick={handleOnClose} size="large">
<CloseIcon />
</IconButton>
) : null}