From f545980a613e86d138265ecd1bee39733806113a Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Fri, 30 Aug 2019 16:19:05 +0200
Subject: [PATCH 1/5] :art: Bug sur les titre dans les cartes pleines

---
 source/components/ui/Card.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source/components/ui/Card.css b/source/components/ui/Card.css
index 09b4be4a8..33eecaefd 100644
--- a/source/components/ui/Card.css
+++ b/source/components/ui/Card.css
@@ -20,6 +20,16 @@
 		var(--colour) 100%
 	);
 }
+.ui__.card.plain h1,
+.ui__.card.plain h2,
+.ui__.card.plain h3,
+.ui__.card.plain h4,
+.ui__.card.plain h5,
+.ui__.card.plain h6 {
+	color: white;
+	color: var(--textColour);
+}
+
 .ui__.card.disabled img {
 	filter: saturate(0);
 }

From e61b37cea36c241ce3655a0bb1f8f317fe53931a Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Fri, 30 Aug 2019 16:26:37 +0200
Subject: [PATCH 2/5] =?UTF-8?q?Enl=C3=A8ve=20le=20bouton=20recommencer=20?=
 =?UTF-8?q?=C3=A0=20la=20fin=20de=20la=20simulation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/conversation/Conversation.js     | 14 +++-----------
 source/components/conversation/SeeAnswersButton.js |  2 +-
 source/locales/en.yaml                             |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

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(
 					</T>
 				)}
 			</p>
-			<button className="ui__ small simple  button " onClick={resetSimulation}>
-				<T>Recommencer</T>
-			</button>
 		</div>
 	)
 })
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 => ({
 				<button
 					className="ui__ small simple  button "
 					onClick={() => setShowAnswerModal(true)}>
-					<T>Voir mes réponses</T>
+					<T>Modifier mes réponses</T>
 				</button>
 			)}
 			{showAnswerModal && <Answers onClose={() => setShowAnswerModal(false)} />}
diff --git a/source/locales/en.yaml b/source/locales/en.yaml
index 1d8ad2ab2..2c9026210 100644
--- a/source/locales/en.yaml
+++ b/source/locales/en.yaml
@@ -127,7 +127,7 @@ quicklinks:
   Autres questions: Other questions
 Mes réponses: My answers
 Prochaines questions: Next questions
-Voir mes réponses: See my answers
+Modifier mes réponses: Change my answers
 simulation-end:
   title: No more questions left!
   text: You have reached the most accurate estimate.

From 8a4c70d12ea008a81757260e0653b21d3933e868 Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Fri, 30 Aug 2019 16:47:34 +0200
Subject: [PATCH 3/5] =?UTF-8?q?:fountain=5Fpen::art:=20remplace=20'valider?=
 =?UTF-8?q?'=20par=20'suivant'=20et=20r=C3=A9aligne=20le=20bouton=20avec?=
 =?UTF-8?q?=20les=20possibilit=C3=A9s=20dans=20le=20cas=20d'une=20question?=
 =?UTF-8?q?=20oui=20/=20non?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/PaySlipSections.js          |  2 +-
 source/components/conversation/SendButton.js  |  9 +--
 source/components/conversation/TextArea.js    | 57 -------------------
 .../components/conversation/conversation.css  | 11 ++++
 source/locales/en.yaml                        |  3 +-
 5 files changed, 18 insertions(+), 64 deletions(-)
 delete mode 100644 source/components/conversation/TextArea.js

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 */}
 					<Line negative rule={avantagesEnNature} />
 					{/* Salaire net */}
-					<Line negative rule={getRule('contrat salarié . salaire . net')} />
+					<Line rule={getRule('contrat salarié . salaire . net')} />
 				</>
 			) : null}
 			<Line negative rule={getRule('impôt . neutre')} />
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 (
 				<span
 					css={`
+						margin-left: 1rem;
 						.keyIcon {
 							opacity: 0;
 						}
 						${!disabled &&
 							`
 							@media (hover) {
-							
+
 							:hover .keyIcon {
 							opacity: 1
 							}
-							
-							
+
+
 							}`}
 					`}
 					className="sendWrapper">
@@ -46,7 +47,7 @@ export default compose(withTranslation())(
 						disabled={disabled}
 						onClick={() => this.getAction()('accept')}>
 						<span className="text">
-							<Trans>valider</Trans> ✓
+							<Trans>Suivant →</Trans>
 						</span>
 					</button>
 					<span className="keyIcon">
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 (
-				<span>
-					<span className="answer">
-						<textarea
-							{...attributes}
-							{...input}
-							id={'step-' + name}
-							onKeyDown={
-								({ key, ctrlKey }) =>
-									key == 'Enter' &&
-									ctrlKey &&
-									input.value &&
-									(!error ? submit() : input.onBlur()) // blur will trigger the error
-							}
-						/>
-						<button
-							className="ui__ button plain"
-							style={{
-								visibility: sendButtonDisabled ? 'hidden' : 'visible',
-								color: themeColours.textColour,
-								background: themeColours.colour
-							}}
-							onClick={() => (!error ? submit() : null)}>
-							<span className="text">
-								<Trans>valider</Trans>
-							</span>
-							<span className="icon">✓</span>
-						</button>
-					</span>
-					{inputError && <span className="step-input-error">{error}</span>}
-				</span>
-			)
-		}
-	}
-)
diff --git a/source/components/conversation/conversation.css b/source/components/conversation/conversation.css
index ef7336218..0deed9169 100644
--- a/source/components/conversation/conversation.css
+++ b/source/components/conversation/conversation.css
@@ -98,12 +98,20 @@
 
 .step fieldset {
 	margin: 0.8em 0;
+	display: flex;
+	justify-content: flex-end;
+	flex-wrap: wrap;
+	align-items: baseline;
 }
 
 .step fieldset ul {
 	list-style-type: none;
 }
 
+.step fieldset > ul:not(.binaryQuestionList) {
+	width: 100%;
+}
+
 .step.question .variant {
 	margin-bottom: 1em;
 }
@@ -325,6 +333,9 @@
 	margin-left: 0.3em;
 }
 
+.select-answer.commune {
+	flex: 1;
+}
 .select-answer.commune .Select {
 	width: 50%;
 }
diff --git a/source/locales/en.yaml b/source/locales/en.yaml
index 2c9026210..80ccb2566 100644
--- a/source/locales/en.yaml
+++ b/source/locales/en.yaml
@@ -5,8 +5,7 @@ previousSimulationBanner:
 Première estimation: First estimate
 Commencer la simulation: Start simulation
 selectMany: You may pick more than one
-Valider: Accept
-valider: accept
+Suivant: Next
 votre réponse: answer here
 reset: Start over
 resetAll: Discard answers

From 63efd5057af5f64c7a31915162ea58ca0729d21e Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Fri, 30 Aug 2019 17:16:26 +0200
Subject: [PATCH 4/5] :art: Ajoute le logo sur la page de chargement

Fix #625
---
 index.html             | 45 +++++++++++++++++++++++++-----------------
 source/Provider.js     |  2 +-
 source/webpack.prod.js |  2 +-
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/index.html b/index.html
index 1e1ba5548..1e0881f2d 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;
 			}
 
@@ -104,16 +104,18 @@
 
 			/* 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 +150,7 @@
 				from {
 					opacity: 0;
 				}
-				60% {
+				80% {
 					opacity: 0;
 				}
 				100% {
@@ -187,11 +189,18 @@
 	</head>
 
 	<body>
-		<div id="lds-ellipsis">
-			<div></div>
-			<div></div>
-			<div></div>
-			<div></div>
+		<div id="loading">
+			<img
+				src="images/logo.svg"
+				alt="Un service de l'État français"
+				style="width: 300px; margin: auto; margin-bottom: 0.6rem; display:block"
+			/>
+			<div id="lds-ellipsis">
+				<div></div>
+				<div></div>
+				<div></div>
+				<div></div>
+			</div>
 		</div>
 
 		<!-- USER AGENT DATA ATTRIBUTE  -->
diff --git a/source/Provider.js b/source/Provider.js
index 4d56bdc29..abdc5906b 100644
--- a/source/Provider.js
+++ b/source/Provider.js
@@ -69,7 +69,7 @@ export default class Provider extends PureComponent {
 	opacity: 1 !important;
 	transform: translateY(0px) !important;
 }
-#lds-ellipsis {
+#loading {
 	display: none !important;
 }`
 		document.body.appendChild(css)
diff --git a/source/webpack.prod.js b/source/webpack.prod.js
index b427e0bdd..c05c9d18b 100644
--- a/source/webpack.prod.js
+++ b/source/webpack.prod.js
@@ -32,7 +32,7 @@ const prerenderConfig = () => ({
 					opacity: 1;
 					transform: translateY(0px);
 				}
-				#lds-ellipsis {
+				#loading {
 					display: none;
 				}
 			</style>

From 52e82214f5824197b140998b010dfcd2a340c95f Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Fri, 30 Aug 2019 17:35:49 +0200
Subject: [PATCH 5/5] =?UTF-8?q?:art::bug:=20Emp=C3=A9che=20l'effet=20de=20?=
 =?UTF-8?q?clignotement=20de=20la=20section=20de=20navigation=20au=20charg?=
 =?UTF-8?q?ement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Effet FOUC
---
 index.html                                             |  2 --
 source/Provider.js                                     |  4 ++--
 .../mon-entreprise.fr/layout/Navigation/SideBar.css    |  6 +++---
 .../mon-entreprise.fr/layout/Navigation/SideBar.js     | 10 +++++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/index.html b/index.html
index 1e0881f2d..14b5d51de 100644
--- a/index.html
+++ b/index.html
@@ -98,8 +98,6 @@
 			/* Prevent FOUC effect */
 			#js {
 				opacity: 0;
-				transform: translateY(20px);
-				transition: all 0.4s;
 			}
 
 			/* CSS Loader */
diff --git a/source/Provider.js b/source/Provider.js
index abdc5906b..1cab5bc32 100644
--- a/source/Provider.js
+++ b/source/Provider.js
@@ -66,8 +66,8 @@ 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;
 }
 #loading {
 	display: none !important;
diff --git a/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.css b/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.css
index 8f1dbfa2c..fb6d892dd 100644
--- a/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.css
+++ b/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.css
@@ -3,17 +3,17 @@
 	position: absolute;
 	left: 0;
 	top: 0;
+	transform: translate(-100%);
 	/* let the browser know we plan to animate
 	   each view in and out */
 	will-change: transform;
 	transition: transform 0.3s cubic-bezier(0.465, 0.183, 0.153, 0.946);
-	transform: translate(-100%);
 	z-index: 1;
 }
-
 .sidebar__container.opened {
-	transform: translateX(0);
+	transform: translate(0%);
 }
+
 .sidebar__container + * {
 	will-change: transform;
 	transition: transform 0.3s cubic-bezier(0.465, 0.183, 0.153, 0.946);
diff --git a/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js b/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js
index 9bbb7f1af..2cf0377fe 100644
--- a/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js
+++ b/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js
@@ -8,7 +8,7 @@ import { withRouter } from 'react-router'
 import backSvg from './back.svg'
 import mobileMenuSvg from './mobile-menu.svg'
 import './SideBar.css'
-import type { Tracker } from 'Components/utils/withTracker'
+import type Tracker from '../../../../Tracker'
 import type { Location } from 'react-router-dom'
 
 type OwnProps = {|
@@ -79,10 +79,10 @@ class SideBar extends React.Component<Props, State> {
 	render() {
 		return (
 			<div
-				className={classnames(
-					'sidebar__container',
-					this.state.opened && 'opened'
-				)}
+				css="transform: translate(-100%)" // prevent FOUC effect
+				className={classnames('sidebar__container', {
+					opened: this.state.opened
+				})}
 				ref={ref => (this.ref = ref)}>
 				<div className="sidebar">{this.props.children}</div>
 				<button