From 06f10f797ab5bb72626ac696f1ec0aa6f0f35278 Mon Sep 17 00:00:00 2001
From: mama <mael.thomas@data.gouv.fr>
Date: Thu, 19 Oct 2017 16:20:57 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20de=20la=20barre=20de=20r=C3=A9sult?=
 =?UTF-8?q?at=20pour=201=20objectif=20seulement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/Results.js                  |  2 +-
 source/components/Simulateur.js               |  2 +-
 source/components/rule/RuleValueVignette.css  | 82 +++++--------------
 source/components/rule/RuleValueVignette.js   |  2 +-
 source/components/rule/RuleValueVignette2.css | 48 -----------
 5 files changed, 22 insertions(+), 114 deletions(-)
 delete mode 100644 source/components/rule/RuleValueVignette2.css

diff --git a/source/components/Results.js b/source/components/Results.js
index 3a392b1f3..35c9f0640 100644
--- a/source/components/Results.js
+++ b/source/components/Results.js
@@ -44,7 +44,7 @@ export default class Results extends Component {
 						</Link>
 					</div>
 					: <div id="results-titles">
-						<h2><i className="fa fa-calculator" aria-hidden="true"></i>Vos résultats</h2>
+						<h2><i className="fa fa-calculator" aria-hidden="true"></i>{explanation.length == 1 ? 'Votre résultat' : 'Vos résultats'}</h2>
 					</div>
 				}
 				<ul>
diff --git a/source/components/Simulateur.js b/source/components/Simulateur.js
index 97c53a8c7..3d6e92165 100644
--- a/source/components/Simulateur.js
+++ b/source/components/Simulateur.js
@@ -96,7 +96,7 @@ export default class extends Component {
 						<button onClick={() => this.setState({started: true})}>J'ai compris</button>
 					</div>
 				}
-				{ started &&
+				{ (started || !sim(['introduction', 'notes'])) &&
 						<Conversation initialValues={ R.pathOr({},['simulateur','par défaut'], sim) } {...{foldedSteps, unfoldedSteps, extraSteps, reinitalise, situation, situationGate}}/>
 				}
 
diff --git a/source/components/rule/RuleValueVignette.css b/source/components/rule/RuleValueVignette.css
index ac0fa568d..3b8d72a6b 100644
--- a/source/components/rule/RuleValueVignette.css
+++ b/source/components/rule/RuleValueVignette.css
@@ -1,7 +1,4 @@
 
-.RuleValueVignette {
-	margin: 0 1em 0 30%;
-}
 
 .RuleValueVignette li a {
 	text-decoration: none;
@@ -9,84 +6,43 @@
 .RuleValueVignette .rule-type {
 	color: white;
 	border: none;
-	font-size: 85%;
 	line-height: 2em;
 	font-weight: 600;
 	margin: .6em 0 .1em;
 }
-
 .RuleValueVignette .rule-box {
-	padding: .6em 1em;
-	color: #333350;
-	background: white;
-	border-radius: 3px;
-	white-space: nowrap;
-	height: 8em;
 	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	justify-content: center;
+	justify-content: space-between;
+}
+.RuleValueVignette .rule-box:hover {
+	background: rgba(255, 255, 255, 0.16)
 }
 
-.RuleValueVignette .rule-name {
-	font-size: 175%;
-	font-weight: 600;
+.RuleValueVignette .rule-box > span {
+	display: inline-block;
 }
 
-.RuleValueVignette p {
-	margin: 0;
-	padding: 0 0;
-	font-size: 120%;
-	color: inherit;
-	width: 100%;
+.RuleValueVignette .rule-value {
+	transition: background .8s;
 }
-.RuleValueVignette.number p {
-	color: #4A89DC;
-	font-weight: bold;
-}
-.RuleValueVignette.unsatisfied p {
+.RuleValueVignette .rule-value .unsatisfied {
 	font-style: italic;
 }
-.RuleValueVignette.irrelevant p {
-	font-weight: 600;
+.RuleValueVignette .rule-value .irrelevant {
+	font-style: normal;
 }
-.RuleValueVignette p .figure {
-	font-size: 250%;
-}
-
-
-.RuleValueVignette:not(.unsatisfied):not(.irrelevant) .rule-box {
-	border-bottom: .8em solid #4A89DC;
-}
-
-.RuleValueVignette:hover .rule-box {
-	background: #ddd;
-}
-.RuleValueVignette.irrelevant .rule-box {
-	background: rgba(255, 255, 255, 0.35);
+.RuleValueVignette .rule-value .figure {
+	font-weight: bold;
 }
 
 
 
-.RuleValueVignette.irrelevant .rule-type {
-	color: rgba(255, 255, 255, 0.35);
+/* Animation of summary figures changes : flash ! */
+.flash-enter {
+		background: rgba(255, 255, 255, 1);
 }
 
-.RuleValueVignette.irrelevant .rule-name {
-	text-decoration: line-through;
-}
-
-
-
-
-@media (max-width: 1280px) {
-
-
-	.RuleValueVignette .rule-box p {
-		padding: 0.6em;
-	}
-
-	.RuleValueVignette .rule-name {
-		font-size: 150%;
-	}
+.flash-leave {
+		/* Completely hide the button while it's being animated and before it's removed from the DOM. */
+		display: none;
 }
diff --git a/source/components/rule/RuleValueVignette.js b/source/components/rule/RuleValueVignette.js
index b98145492..7191e0e75 100644
--- a/source/components/rule/RuleValueVignette.js
+++ b/source/components/rule/RuleValueVignette.js
@@ -6,7 +6,7 @@ import { capitalise0 } from "../../utils"
 let fmt = new Intl.NumberFormat("fr-FR").format
 export let humanFigure = decimalDigits => value =>
 	fmt(value.toFixed(decimalDigits))
-import "./RuleValueVignette2.css"
+import "./RuleValueVignette.css"
 import ReactCSSTransitionGroup from "react-addons-css-transition-group"
 
 export default ({
diff --git a/source/components/rule/RuleValueVignette2.css b/source/components/rule/RuleValueVignette2.css
deleted file mode 100644
index 3b8d72a6b..000000000
--- a/source/components/rule/RuleValueVignette2.css
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-.RuleValueVignette li a {
-	text-decoration: none;
-}
-.RuleValueVignette .rule-type {
-	color: white;
-	border: none;
-	line-height: 2em;
-	font-weight: 600;
-	margin: .6em 0 .1em;
-}
-.RuleValueVignette .rule-box {
-	display: flex;
-	justify-content: space-between;
-}
-.RuleValueVignette .rule-box:hover {
-	background: rgba(255, 255, 255, 0.16)
-}
-
-.RuleValueVignette .rule-box > span {
-	display: inline-block;
-}
-
-.RuleValueVignette .rule-value {
-	transition: background .8s;
-}
-.RuleValueVignette .rule-value .unsatisfied {
-	font-style: italic;
-}
-.RuleValueVignette .rule-value .irrelevant {
-	font-style: normal;
-}
-.RuleValueVignette .rule-value .figure {
-	font-weight: bold;
-}
-
-
-
-/* Animation of summary figures changes : flash ! */
-.flash-enter {
-		background: rgba(255, 255, 255, 1);
-}
-
-.flash-leave {
-		/* Completely hide the button while it's being animated and before it's removed from the DOM. */
-		display: none;
-}