diff options
| -rw-r--r-- | frontend/common/app.css | 11 | ||||
| -rw-r--r-- | frontend/views/index/index.container.js | 12 | ||||
| -rw-r--r-- | frontend/views/page/page.container.js | 2 |
3 files changed, 18 insertions, 7 deletions
diff --git a/frontend/common/app.css b/frontend/common/app.css index 0e4f74d..f7a459c 100644 --- a/frontend/common/app.css +++ b/frontend/common/app.css @@ -8,7 +8,7 @@ html, body { body { background: #000; color: #ddd; - overflow-y: scroll; + overflow: hidden; font-family: 'Roboto', sans-serif; font-size: 0.875rem; height: 100%; @@ -24,7 +24,11 @@ body { height: 100%; width: 100%; } -.app, +.app { + /*display: flex;*/ + height: 100%; + width: 100%; +} .app > div { display: flex; flex-direction: column; @@ -33,8 +37,11 @@ body { } .app .body { display: flex; + flex-direction: column; flex-grow: 1; position: relative; + height: 100%; + width: 100%; } .row { diff --git a/frontend/views/index/index.container.js b/frontend/views/index/index.container.js index 2da89cb..c6cb819 100644 --- a/frontend/views/index/index.container.js +++ b/frontend/views/index/index.container.js @@ -19,12 +19,14 @@ class Container extends Component { } render() { return ( - <div className='body'> + <div> <Header /> - <div className='index'> - <Route exact path='/index/new' component={GraphNew} /> - <Route exact path='/index/:id/edit' component={GraphEdit} /> - <Route exact path='/index' component={GraphIndex} /> + <div className='body'> + <div className='index'> + <Route exact path='/index/new' component={GraphNew} /> + <Route exact path='/index/:id/edit' component={GraphEdit} /> + <Route exact path='/index' component={GraphIndex} /> + </div> </div> </div> ) diff --git a/frontend/views/page/page.container.js b/frontend/views/page/page.container.js index 6993632..0c366ab 100644 --- a/frontend/views/page/page.container.js +++ b/frontend/views/page/page.container.js @@ -44,6 +44,8 @@ class PageContainer extends Component { actions.site.setSiteTitle(data.res.title) if (!data.res.tiles.length) { this.props.pageActions.showAddTileForm() + } else { + this.props.pageActions.hideAddTileForm() } }) } |
