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 (
-
+
+