From adf556c36f862bcdb5a1beb9245c48210b083988 Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Mon, 22 Jul 2019 11:57:27 +0200
Subject: [PATCH] :art: Alignement des valeurs des expressions dans /doc

---
 source/components/rule/Algorithm.css      | 14 +++++---------
 source/engine/mecanismViews/Variations.js |  2 +-
 source/engine/mecanisms.js                |  2 +-
 source/locales/en.yaml                    |  1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/source/components/rule/Algorithm.css b/source/components/rule/Algorithm.css
index de8d70715..42d1b1053 100644
--- a/source/components/rule/Algorithm.css
+++ b/source/components/rule/Algorithm.css
@@ -23,24 +23,22 @@
 	display: inline-block;
 }
 
-.node.inlineExpression:not(.comparison):not(.negation) {
+.node.inlineExpression:not(.comparison) {
 	padding-left: 0;
 	display: flex;
 	align-items: baseline;
 	flex-direction: row;
 	flex-wrap: wrap;
+	justify-content: space-between;
 }
 .nodeContent {
 	margin-right: 0.3em;
 }
-#rule-rules
-	.inlineExpression:not(.comparison):not(.negation)
-	> .situationValue {
+#rule-rules .inlineExpression:not(.comparison) > .situationValue {
 	margin-left: 0.3em;
 	margin-bottom: 0.6em;
 	margin-top: 0.3em;
 	align-items: flex-end;
-	flex: 1;
 	text-align: right;
 }
 
@@ -210,8 +208,7 @@
 
 .mecanism.cond *:not(.nodeContent) > .variable .name,
 .mecanism.variations *:not(.nodeContent) > .variable .name,
-.inlineExpression.comparison,
-.inlineExpression.negation {
+.inlineExpression.comparison {
 	display: flex;
 	align-items: baseline;
 }
@@ -223,8 +220,7 @@
 	> .variable
 	.name
 	.situationValue,
-.inlineExpression.comparison > .situationValue,
-.inlineExpression.negation > .situationValue {
+.inlineExpression.comparison > .situationValue {
 	order: -1;
 }
 
diff --git a/source/engine/mecanismViews/Variations.js b/source/engine/mecanismViews/Variations.js
index af9f868f4..2683cf337 100644
--- a/source/engine/mecanismViews/Variations.js
+++ b/source/engine/mecanismViews/Variations.js
@@ -46,7 +46,7 @@ let Comp = withLanguage(function Variations({
 										}}>
 										{!satisfied && showValues && (
 											<>
-												non applicable{' '}
+												<em>non applicable </em>
 												{expandedVariation !== i ? (
 													<button
 														className="ui__ link-button"
diff --git a/source/engine/mecanisms.js b/source/engine/mecanisms.js
index 4c36925fe..dd27b1afa 100644
--- a/source/engine/mecanisms.js
+++ b/source/engine/mecanisms.js
@@ -255,7 +255,7 @@ export let mecanismNumericalSwitch = (recurse, k, v) => {
 
 	// la conséquence peut être un 'string' ou un autre aiguillage numérique
 	let parseCondition = ([condition, consequence]) => {
-		let conditionNode = recurse(condition), // can be a 'comparison', a 'variable', TODO a 'negation'
+		let conditionNode = recurse(condition), // can be a 'comparison', a 'variable'
 			consequenceNode = mecanismNumericalSwitch(recurse, condition, consequence)
 
 		let evaluate = (cache, situationGate, parsedRules, node) => {
diff --git a/source/locales/en.yaml b/source/locales/en.yaml
index cebdd8d4a..c0a412399 100644
--- a/source/locales/en.yaml
+++ b/source/locales/en.yaml
@@ -28,7 +28,6 @@ radio_Non: No
 radio_Aucun: None
 oui: yes
 non: no
-inlineExpressionNegation: Not
 déplier: show more
 replier: show less
 Salaire brut: Gross salary