Skip to main content
Explore
Sign in
Explore
Snippets Groups Projects
Commit c01d10af authored by Emmanuel Raviart's avatar Emmanuel Raviart
Browse files

Merge branch 'amelioration-ui-suite-demo' into 'master' 

Picto handicap et garde alternée - distance en px au lieu de rem pour éviter...

See merge request leximpact/leximpact-socio-fiscal-ui!113
parents 7de24ee1 6647c901
No related branches found
No related tags found
1 merge request!113Picto handicap et garde alternée - distance en px au lieu de rem pour éviter...
Pipeline #6802 passed
Stage: build
Show whitespace changes
Inline Side-by-side
src/lib/components/test_cases/TestCaseSummary.svelte
+ 3
− 3
View file @ c01d10af
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
<PictoBigParent /> <PictoBigParent />
{/if} {/if}
{#if handicap} {#if handicap}
<div class="absolute -right-7 -top-1"> <div class="absolute -right-[24px] -top-[8px]">
<PictoHandicap /> <PictoHandicap />
</div> </div>
{/if} {/if}
...@@ -328,12 +328,12 @@ ...@@ -328,12 +328,12 @@
<PictoBigPersonneACharge /> <PictoBigPersonneACharge />
{/if} {/if}
{#if handicap} {#if handicap}
<div class="absolute -right-7 -top-3"> <div class="absolute -right-[28px] -top-[8px]">
<PictoHandicap /> <PictoHandicap />
</div> </div>
{/if} {/if}
{#if garde_alternee} {#if garde_alternee}
<div class="absolute -right-0.5 -bottom-1.5"> <div class="absolute -right-[2px] -bottom-[6px]">
<PictoGardeAlternee /> <PictoGardeAlternee />
</div> </div>
{/if} {/if}
... ...
......
src/lib/components/test_cases/TestCaseView.svelte
+ 14
− 9
View file @ c01d10af
...@@ -148,21 +148,26 @@ ...@@ -148,21 +148,26 @@
amendment: amendment:
Object.keys($parametricReform).length === 0 Object.keys($parametricReform).length === 0
? undefined ? undefined
: evaluationByName[ : Math.abs(
evaluationByName[
displayMode.parametersVariableName displayMode.parametersVariableName
]?.calculationEvaluationByName["amendment"] ]?.calculationEvaluationByName["amendment"]
?.deltaAtVectorIndex ?? 0, ?.deltaAtVectorIndex ?? 0,
),
bill: bill:
$billName === undefined $billName === undefined
? undefined ? undefined
: evaluationByName[ : Math.abs(
evaluationByName[
displayMode.parametersVariableName displayMode.parametersVariableName
]?.calculationEvaluationByName["bill"] ]?.calculationEvaluationByName["bill"]
?.deltaAtVectorIndex ?? 0, ?.deltaAtVectorIndex ?? 0,
law: ),
law: Math.abs(
evaluationByName[displayMode.parametersVariableName] evaluationByName[displayMode.parametersVariableName]
?.calculationEvaluationByName["law"] ?.calculationEvaluationByName["law"]
?.deltaAtVectorIndex ?? 0, ?.deltaAtVectorIndex ?? 0,
),
}} }}
/> />
</div> </div>
... ...
......
src/lib/components/tutorial/StartTutorial.svelte
+ 1
− 1
View file @ c01d10af
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<button on:click={() => (isBudgetButtonModalOpen = true)}> <button on:click={() => (isBudgetButtonModalOpen = true)}>
<div <div
class="border-1 absolute bottom-8 left-8 flex items-center rounded-full bg-gray-300 p-3 px-4 uppercase shadow-lg hover:bg-le-bleu hover:text-white" class="border-1 absolute bottom-[32px] left-[32px] flex items-center rounded-full bg-gray-300 p-[12px] px-4 uppercase shadow-lg hover:bg-le-bleu hover:text-white"
> >
<PictoBudgetEtat /> <PictoBudgetEtat />
Impacts budgétaires Impacts budgétaires
... ...
......
src/routes/+page.svelte
+ 52
− 24
View file @ c01d10af
...@@ -767,7 +767,7 @@ ...@@ -767,7 +767,7 @@
Modifier le droit en vigueur Modifier le droit en vigueur
</h1> </h1>
<!--Partie II modification de la loi - MOBILE--> <!--Partie II modification de la loi - MOBILE-->
{#if Object.keys($parametricReform).length !== 0} {#if billName !== undefined}
<div class="mb-3"> <div class="mb-3">
<div <div
class="mx-3 flex flex-col rounded-b border bg-gray-200 px-2 py-1 shadow-md md:hidden" class="mx-3 flex flex-col rounded-b border bg-gray-200 px-2 py-1 shadow-md md:hidden"
...@@ -790,9 +790,23 @@ ...@@ -790,9 +790,23 @@
icon="ri:arrow-up-s-line" icon="ri:arrow-up-s-line"
/> />
{/if} {/if}
<span class="text-lg font-light" <span class="mr-1 text-lg font-light"
>Modifications en cours</span >Modifications en cours</span
> >
{#if Object.keys($parametricReform).length !== 0 && displayMode.mobileLaw}
<span class="mr-0.5 flex h-3 w-3">
<span
class="relative inline-flex h-3 w-3 rounded-full bg-le-jaune"
/>
</span>
{/if}
{#if Object.keys($billName).length !== 0 && displayMode.mobileLaw}
<span class="mr-0.5 flex h-3 w-3">
<span
class="relative inline-flex h-3 w-3 rounded-full bg-le-rouge-bill"
/>
</span>
{/if}
</button> </button>
</div> </div>
{#if modificationsOpen} {#if modificationsOpen}
...@@ -831,12 +845,12 @@ ...@@ -831,12 +845,12 @@
{:else} {:else}
<div class="md:h-[calc(100vh-13rem)]"> <div class="md:h-[calc(100vh-13rem)]">
<h1 <h1
class="ml-3 flex border-b border-black pt-3 text-2xl font-bold text-black md:hidden" class="ml-3 flex border-b border-black pt-3 pb-3 text-2xl font-bold text-black md:hidden"
> >
Modifier le droit en vigueur Modifier le droit en vigueur
</h1> </h1>
<!--Partie II modification de la loi - MOBILE - vue choisir un dispositif --> <!--Partie II modification de la loi - MOBILE - vue choisir un dispositif -->
{#if Object.keys($parametricReform).length !== 0} {#if billName !== undefined}
<div class="mb-3"> <div class="mb-3">
<div <div
class="mx-3 flex flex-col rounded-b border bg-gray-200 px-2 py-1 shadow-md md:hidden" class="mx-3 flex flex-col rounded-b border bg-gray-200 px-2 py-1 shadow-md md:hidden"
...@@ -859,9 +873,23 @@ ...@@ -859,9 +873,23 @@
icon="ri:arrow-up-s-line" icon="ri:arrow-up-s-line"
/> />
{/if} {/if}
<span class="text-lg font-light" <span class="mr-1 text-lg font-light"
>Modifications en cours</span >Modifications en cours
> </span>
{#if Object.keys($parametricReform).length !== 0 && displayMode.mobileLaw}
<span class="mr-0.5 flex h-3 w-3">
<span
class="relative inline-flex h-3 w-3 rounded-full bg-le-jaune"
/>
</span>
{/if}
{#if Object.keys($billName).length !== 0 && displayMode.mobileLaw}
<span class="mr-0.5 flex h-3 w-3">
<span
class="relative inline-flex h-3 w-3 rounded-full bg-le-rouge-bill"
/>
</span>
{/if}
</button> </button>
</div> </div>
{#if modificationsOpen} {#if modificationsOpen}
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment