X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7f440c8e719b78ddbccf90ab42b6b38575dc8c21..850ea77da5cce0b5c5a9308e3253a7118839863f:/src/components/text-field/text-field.tsx diff --git a/src/components/text-field/text-field.tsx b/src/components/text-field/text-field.tsx index 5f21f971..78e2c7fb 100644 --- a/src/components/text-field/text-field.tsx +++ b/src/components/text-field/text-field.tsx @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; import { WrappedFieldProps } from 'redux-form'; -import { ArvadosTheme } from '~/common/custom-theme'; +import { ArvadosTheme } from 'common/custom-theme'; import { TextField as MaterialTextField, StyleRulesCallback, @@ -13,13 +13,12 @@ import { PropTypes } from '@material-ui/core'; import RichTextEditor from 'react-rte'; -import Margin = PropTypes.Margin; type CssRules = 'textField' | 'rte'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ textField: { - marginBottom: theme.spacing.unit * 3 + marginBottom: theme.spacing.unit }, rte: { fontFamily: 'Arial', @@ -30,14 +29,14 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ cursor: 'pointer', textDecoration: 'underline' } - } + } } }); type TextFieldProps = WrappedFieldProps & WithStyles; export const TextField = withStyles(styles)((props: TextFieldProps & { - label?: string, autoFocus?: boolean, required?: boolean, select?: boolean, disabled?: boolean, children: React.ReactNode, margin?: Margin, placeholder?: string, + label?: string, autoFocus?: boolean, required?: boolean, select?: boolean, disabled?: boolean, children: React.ReactNode, margin?: PropTypes.Margin, placeholder?: string, helperText?: string, type?: string, }) =>