Skip to content
This repository was archived by the owner on Jan 16, 2022. It is now read-only.
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
8 changes: 4 additions & 4 deletions src/components/Login/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import React, { Component } from 'react';
import DialogTitle from '@material-ui/core/DialogTitle';
import Dialog from '@material-ui/core/Dialog';
import DialogActions from '@material-ui/core/DialogActions';
import DialogContent from '@material-ui/core/DialogContent';
import SnackbarContent from '@material-ui/core/SnackbarContent';
import ErrorIcon from '@material-ui/icons/Error';
import InputLabel from '@material-ui/core/InputLabel';
Expand All @@ -12,6 +8,10 @@ import FormHelperText from '@material-ui/core/FormHelperText';
import { css } from 'emotion';

import Button from '../../muiComponents/Button';
import Dialog from '../../muiComponents/Dialog';
import DialogTitle from '../../muiComponents/DialogTitle';
import DialogContent from '../../muiComponents/DialogContent';
import DialogActions from '../../muiComponents/DialogActions';

import * as classes from './styles';

Expand Down
4 changes: 2 additions & 2 deletions src/components/RegistryInfoDialog/RegistryInfoDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import Dialog from '@material-ui/core/Dialog';
import DialogActions from '@material-ui/core/DialogActions';

import Button from '../../muiComponents/Button';
import Dialog from '../../muiComponents/Dialog';
import DialogActions from '../../muiComponents/DialogActions';

import { Title, Content } from './styles';
import { Props } from './types';
Expand Down
16 changes: 6 additions & 10 deletions src/components/RegistryInfoDialog/styles.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
import styled from 'react-emotion';
import DialogTitle from '@material-ui/core/DialogTitle';
import DialogContent from '@material-ui/core/DialogContent';

import colors from '../../utils/styles/colors';
import { fontSize } from '../../utils/styles/sizes';
import DialogTitle from '../../muiComponents/DialogTitle';
import DialogContent from '../../muiComponents/DialogContent';

export const Title = styled(DialogTitle)({
'&&': {
backgroundColor: colors.primary,
color: colors.white,
fontSize: fontSize.lg,
},
backgroundColor: colors.primary,
color: colors.white,
fontSize: fontSize.lg,
});

export const Content = styled(DialogContent)({
'&&': {
padding: '0 24px',
},
padding: '0 24px',
});
10 changes: 10 additions & 0 deletions src/muiComponents/Dialog/Dialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React, { forwardRef } from 'react';
import { default as MaterialUIDialog, DialogProps } from '@material-ui/core/Dialog';

type DialogRef = HTMLDivElement;

const Dialog = forwardRef<DialogRef, DialogProps>(function Dialog(props, ref) {
return <MaterialUIDialog {...props} ref={ref} />;
});

export default Dialog;
1 change: 1 addition & 0 deletions src/muiComponents/Dialog/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './Dialog';
10 changes: 10 additions & 0 deletions src/muiComponents/DialogActions/DialogActions.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React, { forwardRef } from 'react';
import { default as MaterialUIDialogActions, DialogActionsProps } from '@material-ui/core/DialogActions';

type DialogActionsRef = HTMLDivElement;

const DialogActions = forwardRef<DialogActionsRef, DialogActionsProps>(function DialogActions(props, ref) {
return <MaterialUIDialogActions {...props} ref={ref} />;
});

export default DialogActions;
1 change: 1 addition & 0 deletions src/muiComponents/DialogActions/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './DialogActions';
10 changes: 10 additions & 0 deletions src/muiComponents/DialogContent/DialogContent.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React, { forwardRef } from 'react';
import { default as MaterialUIDialogContent, DialogContentProps } from '@material-ui/core/DialogContent';

type DialogContentRef = HTMLDivElement;

const DialogContent = forwardRef<DialogContentRef, DialogContentProps>(function DialogContent(props, ref) {
return <MaterialUIDialogContent {...props} ref={ref} />;
});

export default DialogContent;
1 change: 1 addition & 0 deletions src/muiComponents/DialogContent/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './DialogContent';
10 changes: 10 additions & 0 deletions src/muiComponents/DialogTitle/DialogTitle.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React, { forwardRef } from 'react';
import { default as MaterialUIDialogTitle, DialogTitleProps } from '@material-ui/core/DialogTitle';

type DialogTitleRef = HTMLDivElement;

const DialogTitle = forwardRef<DialogTitleRef, DialogTitleProps>(function DialogTitle(props, ref) {
return <MaterialUIDialogTitle {...props} ref={ref} />;
});

export default DialogTitle;
1 change: 1 addition & 0 deletions src/muiComponents/DialogTitle/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './DialogTitle';
10 changes: 4 additions & 6 deletions src/pages/Version/styles.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import styled from 'react-emotion';
import DialogTitle from '@material-ui/core/DialogTitle';

import colors from '../../utils/styles/colors';
import { fontSize } from '../../utils/styles/sizes';
import DialogTitle from '../../muiComponents/DialogTitle';

export const Title = styled(DialogTitle)({
'&&': {
backgroundColor: colors.primary,
color: colors.white,
fontSize: fontSize.lg,
},
backgroundColor: colors.primary,
color: colors.white,
fontSize: fontSize.lg,
});