lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: wrong imports after merge

Browse source
This commit is contained in:
Rafael Taranto 2019-11-12 17:38:16 +00:00
parent 58c93bc265
commit 74d592d892
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
new-lamassu-admin/src/components/inputs/base/Select.js
View file

@ -3,7 +3,7 @@ import { useSelect } from 'downshift'
import { startCase } from 'lodash/fp' import { startCase } from 'lodash/fp'
import classnames from 'classnames' import classnames from 'classnames'
import { ReactComponent as Arrowdown } from '../../styling/icons/action/arrow/regular.svg' import { ReactComponent as Arrowdown } from '../../../styling/icons/action/arrow/regular.svg'
import styles from './Select.styles' import styles from './Select.styles'
import { makeStyles } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/core/styles'

3
new-lamassu-admin/src/pages/ServerLogs.js
View file

@ -14,12 +14,13 @@ import { ReactComponent as Download } from '../styling/icons/button/download/zod
import { ReactComponent as DownloadActive } from '../styling/icons/button/download/white.svg' import { ReactComponent as DownloadActive } from '../styling/icons/button/download/white.svg'
import { makeStyles } from '@material-ui/core' import { makeStyles } from '@material-ui/core'
import { regularLabel } from '../components/typography/styles' import typographyStyles from '../components/typography/styles'
import { comet } from '../styling/variables' import { comet } from '../styling/variables'
import styles from './Logs.styles' import styles from './Logs.styles'
import logPageHeaderStyles from './LogPageHeader.styles' import logPageHeaderStyles from './LogPageHeader.styles'
const { regularLabel } = typographyStyles
const { tableWrapper } = styles const { tableWrapper } = styles
const { titleAndButtonsContainer, buttonsWrapper } = logPageHeaderStyles const { titleAndButtonsContainer, buttonsWrapper } = logPageHeaderStyles