diff --git a/mon-entreprise/source/components/Notifications.tsx b/mon-entreprise/source/components/Notifications.tsx index af92b98b6..7fc85e604 100644 --- a/mon-entreprise/source/components/Notifications.tsx +++ b/mon-entreprise/source/components/Notifications.tsx @@ -64,7 +64,7 @@ export default function Notifications() {
  • - {emoji(sévérité == 'avertissement' ? '⚠️' : 'ℹ️')} + {emoji(sévérité == 'avertissement' ? '⚠️' : '💁🏻')}
    */} - + ) } diff --git a/mon-entreprise/source/components/Simulation.tsx b/mon-entreprise/source/components/Simulation.tsx index f505b14dd..1673558dd 100644 --- a/mon-entreprise/source/components/Simulation.tsx +++ b/mon-entreprise/source/components/Simulation.tsx @@ -1,9 +1,7 @@ import Conversation, { ConversationProps, } from 'Components/conversation/Conversation' -import SeeAnswersButton from 'Components/conversation/SeeAnswersButton' import PageFeedback from 'Components/Feedback/PageFeedback' -import Notifications from 'Components/Notifications' import SearchButton from 'Components/SearchButton' import ShareSimulationBanner from 'Components/ShareSimulationBanner' import TargetSelection from 'Components/TargetSelection' @@ -15,6 +13,7 @@ import { Trans } from 'react-i18next' import { useSelector } from 'react-redux' import { firstStepCompletedSelector } from 'Selectors/simulationSelectors' import { TrackPage } from '../ATInternetTracking' +import SeeAnswersButton from './conversation/SeeAnswersButton' type SimulationProps = { explanations?: React.ReactNode @@ -73,28 +72,36 @@ export function Questions({ return ( <> -
    - {progress < 1 ? ( - - - Affinez votre simulation en répondant aux questions : - - - ) : ( - - )} - -
    - +
    + {progress < 1 && ( +

    + + + Améliorez votre simulation en répondant aux questions + + +

    + )} + +
    +
    diff --git a/mon-entreprise/source/components/conversation/Conversation.tsx b/mon-entreprise/source/components/conversation/Conversation.tsx index dc38b5d4b..84b37577f 100644 --- a/mon-entreprise/source/components/conversation/Conversation.tsx +++ b/mon-entreprise/source/components/conversation/Conversation.tsx @@ -1,5 +1,6 @@ import { goToQuestion, stepAction, updateSituation } from 'Actions/actions' import RuleInput, { InputProps } from 'Components/conversation/RuleInput' +import Notifications from 'Components/Notifications' import QuickLinks from 'Components/QuickLinks' import * as Animate from 'Components/ui/animate' import { EngineContext } from 'Components/utils/EngineContext' @@ -62,7 +63,8 @@ export default function Conversation({ customEndMessages }: ConversationProps) {

    - {engine.getRule(currentQuestion).rawNode.question}{' '} + {engine.getRule(currentQuestion).rawNode.question} +  

    @@ -76,6 +78,7 @@ export default function Conversation({ customEndMessages }: ConversationProps) {
    +
    {previousAnswers.length > 0 && ( <> @@ -105,6 +108,7 @@ export default function Conversation({ customEndMessages }: ConversationProps) { )}
    +
    diff --git a/mon-entreprise/source/components/conversation/Explicable.tsx b/mon-entreprise/source/components/conversation/Explicable.tsx index e330d1055..d647db1a9 100644 --- a/mon-entreprise/source/components/conversation/Explicable.tsx +++ b/mon-entreprise/source/components/conversation/Explicable.tsx @@ -32,7 +32,6 @@ export function ExplicableRule({ dottedName }: { dottedName: DottedName }) { e.stopPropagation() }} css={` - margin-left: 0.3rem !important; vertical-align: middle; font-size: 110% !important; `} diff --git a/mon-entreprise/source/components/conversation/SeeAnswersButton.tsx b/mon-entreprise/source/components/conversation/SeeAnswersButton.tsx index 326f886c5..316f1ec62 100644 --- a/mon-entreprise/source/components/conversation/SeeAnswersButton.tsx +++ b/mon-entreprise/source/components/conversation/SeeAnswersButton.tsx @@ -8,7 +8,7 @@ export default function SeeAnswersButton() { return ( <>