From 8df444bc17f84236613719f5cdc04b89b2f61f23 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 5 Sep 2018 15:52:02 +1200 Subject: Fix some issues on main screen --- modern/src/MainPage.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'modern/src/MainPage.js') diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js index 02d98dc..36181a9 100644 --- a/modern/src/MainPage.js +++ b/modern/src/MainPage.js @@ -2,6 +2,18 @@ import React, { Component } from 'react'; import ContainerDimensions from 'react-container-dimensions'; import MainToobar from './MainToolbar'; import MainMap from './MainMap'; +import withStyles from '@material-ui/core/styles/withStyles'; + +const styles = theme => ({ + root: { + height: "100vh", + display: "flex", + flexDirection: "column" + }, + mapContainer: { + flexGrow: 1 + } +}); class MainPage extends Component { constructor(props) { @@ -24,6 +36,7 @@ class MainPage extends Component { } render() { + const { classes } = this.props; const { loading } = this.state; if (loading) { return ( @@ -31,11 +44,9 @@ class MainPage extends Component { ); } else { return ( -
-
- -
-
+
+ +
@@ -46,4 +57,4 @@ class MainPage extends Component { } } -export default MainPage; +export default withStyles(styles)(MainPage); -- cgit v1.2.3