From b6703ecb58a14c80f2658c160b1af079b6b0ae03 Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Thu, 21 Apr 2022 12:22:39 +0200
Subject: [PATCH] =?UTF-8?q?Corrige=20l'espacement=20des=20banni=C3=A8res?=
 =?UTF-8?q?=20apr=C3=A8s=20le=20simulateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PreviousSimulationBanner.tsx   |  8 +-
 site/source/components/Simulation/index.tsx   | 82 ++++++++++---------
 2 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/site/source/components/PreviousSimulationBanner.tsx b/site/source/components/PreviousSimulationBanner.tsx
index 9e71da224..7122a13f6 100644
--- a/site/source/components/PreviousSimulationBanner.tsx
+++ b/site/source/components/PreviousSimulationBanner.tsx
@@ -14,8 +14,8 @@ export default function PreviousSimulationBanner() {
 	const dispatch = useDispatch()
 
 	return (
-		<div className="print-hidden">
-			<Banner hidden={!previousSimulation || newSimulationStarted} icon="💾">
+		<Banner hidden={!previousSimulation || newSimulationStarted} icon="💾">
+			<div className="print-hidden">
 				<Trans i18nKey="previousSimulationBanner.info">
 					Votre précédente simulation a été sauvegardée :
 				</Trans>{' '}
@@ -24,7 +24,7 @@ export default function PreviousSimulationBanner() {
 						Retrouver ma simulation
 					</Trans>
 				</Link>
-			</Banner>
-		</div>
+			</div>
+		</Banner>
 	)
 }
diff --git a/site/source/components/Simulation/index.tsx b/site/source/components/Simulation/index.tsx
index 8ac3081ae..425d3a0c0 100644
--- a/site/source/components/Simulation/index.tsx
+++ b/site/source/components/Simulation/index.tsx
@@ -62,48 +62,52 @@ export default function Simulation({
 				<StyledGrid item xl={9} lg={10} md={11} sm={12}>
 					<PrintExportRecover />
 					{children}
-
-					<div className="print-hidden">
-						{!firstStepCompleted && (
+					<FromTop>
+						<div className="print-hidden">
+							{!firstStepCompleted && (
+								<>
+									<Spacing sm />
+									<PreviousSimulationBanner />
+								</>
+							)}
+						</div>
+						{firstStepCompleted && (
 							<>
-								<Spacing sm />
-								<PreviousSimulationBanner />
+								<div className="print-hidden">
+									<FromTop>{results}</FromTop>
+								</div>
+								<Questions customEndMessages={customEndMessages} />
 							</>
 						)}
-					</div>
-					{firstStepCompleted && (
-						<>
-							<div className="print-hidden">
-								<FromTop>{results}</FromTop>
-							</div>
-							<Questions customEndMessages={customEndMessages} />
-						</>
-					)}
-					<div className="print-hidden">
-						<Spacing sm />
-						{afterQuestionsSlot}
-						{existingCompany && (
-							<Banner icon="✏">
-								Ce simulateur a été prérempli avec la situation de votre
-								entreprise.{' '}
-								<PopoverWithTrigger
-									trigger={(buttonProps) => (
-										<Link {...buttonProps}>
-											<Trans>Voir ma situation</Trans>
-										</Link>
-									)}
-								>
-									{(close) => <AnswerList onClose={close} />}
-								</PopoverWithTrigger>
-							</Banner>
-						)}
-						{firstStepCompleted && !hideDetails && (
-							<>
-								<ShareOrSaveSimulationBanner share print placeDesEntreprises />
-								<Spacing lg />
-							</>
-						)}
-					</div>
+						<div className="print-hidden">
+							{afterQuestionsSlot}
+							{existingCompany && (
+								<Banner icon="✏">
+									Ce simulateur a été prérempli avec la situation de votre
+									entreprise.{' '}
+									<PopoverWithTrigger
+										trigger={(buttonProps) => (
+											<Link {...buttonProps}>
+												<Trans>Voir ma situation</Trans>
+											</Link>
+										)}
+									>
+										{(close) => <AnswerList onClose={close} />}
+									</PopoverWithTrigger>
+								</Banner>
+							)}
+							{firstStepCompleted && !hideDetails && (
+								<>
+									<ShareOrSaveSimulationBanner
+										share
+										print
+										placeDesEntreprises
+									/>
+									<Spacing lg />
+								</>
+							)}
+						</div>
+					</FromTop>
 				</StyledGrid>
 			</Grid>
 			{firstStepCompleted && !hideDetails && (