From be577a90cd244a3f81537a1d9f370dd18838cddb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 3 Jun 2020 23:27:50 +0200 Subject: fixing layout --- frontend/common/app.css | 11 +++++++++-- frontend/views/index/index.container.js | 12 +++++++----- frontend/views/page/page.container.js | 2 ++ 3 files changed, 18 insertions(+), 7 deletions(-) (limited to 'frontend') 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 ( -
+
-
- - - +
+
+ + + +
) 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() } }) } -- cgit v1.2.3-70-g09d2