diff options
Diffstat (limited to 'language-web/src/main/js/App.jsx')
-rw-r--r-- | language-web/src/main/js/App.jsx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/language-web/src/main/js/App.jsx b/language-web/src/main/js/App.jsx index a0920823..5bd46c09 100644 --- a/language-web/src/main/js/App.jsx +++ b/language-web/src/main/js/App.jsx | |||
@@ -1,5 +1,4 @@ | |||
1 | import React from 'react'; | 1 | import React from 'react'; |
2 | import { makeStyles } from '@material-ui/core/styles'; | ||
3 | import AppBar from '@material-ui/core/AppBar'; | 2 | import AppBar from '@material-ui/core/AppBar'; |
4 | import Box from '@material-ui/core/Box'; | 3 | import Box from '@material-ui/core/Box'; |
5 | import Button from '@material-ui/core/Button'; | 4 | import Button from '@material-ui/core/Button'; |
@@ -9,10 +8,11 @@ import Typography from '@material-ui/core/Typography'; | |||
9 | import MenuIcon from '@material-ui/icons/Menu'; | 8 | import MenuIcon from '@material-ui/icons/Menu'; |
10 | import PlayArrowIcon from '@material-ui/icons/PlayArrow'; | 9 | import PlayArrowIcon from '@material-ui/icons/PlayArrow'; |
11 | 10 | ||
11 | import { makeStyles } from './makeStyles'; | ||
12 | import Editor from './editor/Editor'; | 12 | import Editor from './editor/Editor'; |
13 | import EditorButtons from './editor/EditorButtons'; | 13 | import EditorButtons from './editor/EditorButtons'; |
14 | 14 | ||
15 | const useStyles = makeStyles(theme => ({ | 15 | const useStyles = makeStyles()(theme => ({ |
16 | container: { | 16 | container: { |
17 | maxHeight: '100vh', | 17 | maxHeight: '100vh', |
18 | }, | 18 | }, |
@@ -28,13 +28,13 @@ const useStyles = makeStyles(theme => ({ | |||
28 | })); | 28 | })); |
29 | 29 | ||
30 | export default () => { | 30 | export default () => { |
31 | const classes = useStyles(); | 31 | const { classes, cx } = useStyles(); |
32 | 32 | ||
33 | return ( | 33 | return ( |
34 | <Box | 34 | <Box |
35 | display='flex' | 35 | display='flex' |
36 | flexDirection='column' | 36 | flexDirection='column' |
37 | className={classes.container} | 37 | className={cx(classes.container)} |
38 | > | 38 | > |
39 | <AppBar | 39 | <AppBar |
40 | position='static' | 40 | position='static' |
@@ -43,7 +43,7 @@ export default () => { | |||
43 | <Toolbar> | 43 | <Toolbar> |
44 | <IconButton | 44 | <IconButton |
45 | edge='start' | 45 | edge='start' |
46 | className={classes.menuButton} | 46 | className={cx(classes.menuButton)} |
47 | color='inherit' | 47 | color='inherit' |
48 | aria-label='menu' | 48 | aria-label='menu' |
49 | > | 49 | > |
@@ -52,7 +52,7 @@ export default () => { | |||
52 | <Typography | 52 | <Typography |
53 | variant='h6' | 53 | variant='h6' |
54 | component='h1' | 54 | component='h1' |
55 | className={classes.title} | 55 | className={cx(classes.title)} |
56 | > | 56 | > |
57 | GraphSolver | 57 | GraphSolver |
58 | </Typography> | 58 | </Typography> |
@@ -83,7 +83,7 @@ export default () => { | |||
83 | <Box | 83 | <Box |
84 | flexGrow={1} | 84 | flexGrow={1} |
85 | flexShrink={1} | 85 | flexShrink={1} |
86 | className={classes.editorBox} | 86 | className={cx(classes.editorBox)} |
87 | > | 87 | > |
88 | <Editor/> | 88 | <Editor/> |
89 | </Box> | 89 | </Box> |