diff --git a/source/components/Simulateur.css b/source/components/Simulateur.css index da3bd4ad6..755370cea 100644 --- a/source/components/Simulateur.css +++ b/source/components/Simulateur.css @@ -81,6 +81,13 @@ -#fin { +#sim .tip { font-style: italic; + margin-bottom: 2em; +} +#sim .tip p { + margin: 0; +} +#sim .tip progress { + margin-left: 1em; } diff --git a/source/components/Simulateur.js b/source/components/Simulateur.js index e9352044c..d2df0c04f 100644 --- a/source/components/Simulateur.js +++ b/source/components/Simulateur.js @@ -24,6 +24,8 @@ import Results from 'Components/Results' themeColours: state.themeColours, situationGate: state.situationGate, targetNames: state.targetNames, + done: state.done, + nextSteps: state.nextSteps, inputInversions: formValueSelector('conversation')(state, 'inversions') }), dispatch => ({ @@ -107,6 +109,8 @@ export default class extends Component { ), foldedSteps ), + done: this.props.done, + nextSteps: this.props.nextSteps, textColourOnWhite: themeColours.textColourOnWhite }} /> diff --git a/source/components/conversation/Conversation.js b/source/components/conversation/Conversation.js index f59eccb8b..ff0c3d8cb 100644 --- a/source/components/conversation/Conversation.js +++ b/source/components/conversation/Conversation.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import R from 'ramda' import Aide from '../Aide' import Satisfaction from '../Satisfaction' -import {reduxForm} from 'redux-form' +import { reduxForm } from 'redux-form' import Scroll from 'react-scroll' @reduxForm({ @@ -11,36 +11,57 @@ import Scroll from 'react-scroll' }) export default class Conversation extends Component { render() { - let {foldedSteps, currentQuestion, reinitalise, textColourOnWhite} = this.props + let { + foldedSteps, + currentQuestion, + reinitalise, + textColourOnWhite, + done, + nextSteps + } = this.props Scroll.animateScroll.scrollToBottom() return (
- { !R.isEmpty(foldedSteps) && + {!R.isEmpty(foldedSteps) && (
-
-

Vos réponses

-