diff --git a/index.html b/index.html index 1e1ba5548..14b5d51de 100644 --- a/index.html +++ b/index.html @@ -81,10 +81,10 @@ display: block !important; } - html[data-useragent*='MSIE'] #lds-ellipsis, - html[data-useragent*='Safari'][data-useragent*='Version/8'] #lds-ellipsis, - html[data-useragent*='Safari'][data-useragent*='Version/7'] #lds-ellipsis, - html[data-useragent*='Trident'] #lds-ellipsis { + html[data-useragent*='MSIE'] #loading, + html[data-useragent*='Safari'][data-useragent*='Version/8'] #loading, + html[data-useragent*='Safari'][data-useragent*='Version/7'] #loading, + html[data-useragent*='Trident'] #loading { display: none !important; } @@ -98,22 +98,22 @@ /* Prevent FOUC effect */ #js { opacity: 0; - transform: translateY(20px); - transition: all 0.4s; } /* CSS Loader */ - #lds-ellipsis { - display: block; - position: relative; + #loading { animation: appear 0.6s; - transform: translateY(40vh); - width: 64px; - height: 64px; - margin: auto; + transform: translateY(35vh); + width: 100%; + } + #lds-ellipsis { + margin: auto; + position: relative; + width: 64px; + animation: appear 1.5s; + height: 64px; } - #lds-ellipsis div { position: absolute; top: 27px; @@ -148,7 +148,7 @@ from { opacity: 0; } - 60% { + 80% { opacity: 0; } 100% { @@ -187,11 +187,18 @@ -
-
-
-
-
+
+ Un service de l'État français +
+
+
+
+
+
diff --git a/source/Provider.js b/source/Provider.js index 4d56bdc29..1cab5bc32 100644 --- a/source/Provider.js +++ b/source/Provider.js @@ -66,10 +66,10 @@ export default class Provider extends PureComponent { css.type = 'text/css' css.innerHTML = ` #js { - opacity: 1 !important; - transform: translateY(0px) !important; + animation: appear 0.5s; + opacity: 1; } -#lds-ellipsis { +#loading { display: none !important; }` document.body.appendChild(css) diff --git a/source/components/PaySlipSections.js b/source/components/PaySlipSections.js index c006ca9e4..de6f6df2f 100644 --- a/source/components/PaySlipSections.js +++ b/source/components/PaySlipSections.js @@ -50,7 +50,7 @@ export let SalaireNetSection = ({ getRule }) => { {/* Avantages en nature */} {/* Salaire net */} - + ) : null} diff --git a/source/components/conversation/Conversation.js b/source/components/conversation/Conversation.js index 42e0547ff..a5ae75d33 100644 --- a/source/components/conversation/Conversation.js +++ b/source/components/conversation/Conversation.js @@ -1,11 +1,8 @@ -import { - goToQuestion, - resetSimulation, - validateStepWithValue -} from 'Actions/actions' +import { goToQuestion, validateStepWithValue } from 'Actions/actions' import { T } from 'Components' import QuickLinks from 'Components/QuickLinks' import { getInputComponent } from 'Engine/generateQuestions' +import { findRuleByDottedName } from 'Engine/rules' import { compose } from 'ramda' import React from 'react' import emoji from 'react-easy-emoji' @@ -19,7 +16,6 @@ import { import * as Animate from 'Ui/animate' import Aide from './Aide' import './conversation.css' -import { findRuleByDottedName } from 'Engine/rules' export default compose( reduxForm({ @@ -33,7 +29,7 @@ export default compose( previousAnswers: state.conversationSteps.foldedSteps, nextSteps: nextStepsSelector(state) }), - { resetSimulation, validateStepWithValue, goToQuestion } + { validateStepWithValue, goToQuestion } ) )(function Conversation({ nextSteps, @@ -41,7 +37,6 @@ export default compose( currentQuestion, customEndMessages, flatRules, - resetSimulation, goToQuestion, validateStepWithValue }) { @@ -101,9 +96,6 @@ export default compose( )}

-
) }) diff --git a/source/components/conversation/SeeAnswersButton.js b/source/components/conversation/SeeAnswersButton.js index 66624febb..077349c6d 100644 --- a/source/components/conversation/SeeAnswersButton.js +++ b/source/components/conversation/SeeAnswersButton.js @@ -14,7 +14,7 @@ export default connect(state => ({ )} {showAnswerModal && setShowAnswerModal(false)} />} diff --git a/source/components/conversation/SendButton.js b/source/components/conversation/SendButton.js index 3c2dc613c..f578d5c5d 100644 --- a/source/components/conversation/SendButton.js +++ b/source/components/conversation/SendButton.js @@ -26,18 +26,19 @@ export default compose(withTranslation())( return ( @@ -46,7 +47,7 @@ export default compose(withTranslation())( disabled={disabled} onClick={() => this.getAction()('accept')}> - valider ✓ + Suivant → diff --git a/source/components/conversation/TextArea.js b/source/components/conversation/TextArea.js deleted file mode 100644 index b67be113e..000000000 --- a/source/components/conversation/TextArea.js +++ /dev/null @@ -1,57 +0,0 @@ -import { compose } from 'ramda'; -import React, { Component } from 'react'; -import { Trans, withTranslation } from 'react-i18next'; -import { FormDecorator } from './FormDecorator'; - -export default compose( - FormDecorator('text-area'), - withTranslation() -)( - class Input extends Component { - render() { - let { - name, - input, - submit, - attributes, - meta: { touched, error }, - themeColours - } = this.props, - inputError = touched && error, - sendButtonDisabled = !input.value || inputError - - return ( - - -