From 9e844000c12a8fffc7ffe8cbf7a30fc655f7df53 Mon Sep 17 00:00:00 2001 From: mama Date: Mon, 23 Oct 2017 17:23:26 +0200 Subject: [PATCH] =?UTF-8?q?:art:=20R=C3=A9solution=20un=20peu=20louche=20d?= =?UTF-8?q?u=20chevauchement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/components/Results.css | 1 - source/containers/Layout.css | 6 ------ source/containers/Layout.js | 13 +++++++++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/source/components/Results.css b/source/components/Results.css index 65e474846..97b2e9786 100644 --- a/source/components/Results.css +++ b/source/components/Results.css @@ -1,4 +1,3 @@ - #results { position: fixed; left: 50%; diff --git a/source/containers/Layout.css b/source/containers/Layout.css index 5a1335948..89ef2c88f 100644 --- a/source/containers/Layout.css +++ b/source/containers/Layout.css @@ -35,12 +35,6 @@ h1 { flex-direction: column; } -#ninetyPercent { - width: 100%; - flex-grow: 1; - overflow: auto; -} - #page-type { display: inline-block; position: fixed; diff --git a/source/containers/Layout.js b/source/containers/Layout.js index c09eeddf8..63591e561 100644 --- a/source/containers/Layout.js +++ b/source/containers/Layout.js @@ -25,7 +25,15 @@ const piwik = new ReactPiwik({ export default class Layout extends Component { history = createHistory() - + state = { + resultsHeight: 600 + } + componentDidMount(){ + let resultsEl = document.getElementById('results') + this.setState({ + resultsHeight: resultsEl ? resultsEl.clientHeight : 600 + }) + } render() { let displayWarning = ["/simu/", "/regle/", "/regles"].find( t => window.location.href.toString().indexOf(t) > -1 @@ -37,7 +45,7 @@ export default class Layout extends Component { return (
-
+
+