From 1a5a8d6ad9251de6e0166d91bb1fee64be85e259 Mon Sep 17 00:00:00 2001 From: Dorine Lambinet <dorine.lambinet@gmail.com> Date: Mon, 12 Sep 2022 17:48:00 +0200 Subject: [PATCH] =?UTF-8?q?Augmente=20le=20contraste=20des=20couleurs=20po?= =?UTF-8?q?ur=20=C3=AAtre=20niveau=20AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameters/ScaleAtInstantEdit.svelte | 2 +- .../components/test_cases/TestCaseSummary.svelte | 4 ++-- .../VariableReferredScaleAtInstant.svelte | 2 +- src/routes/+page.svelte | 16 ++++++++-------- tailwind.config.cjs | 3 ++- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/lib/components/parameters/ScaleAtInstantEdit.svelte b/src/lib/components/parameters/ScaleAtInstantEdit.svelte index 090f13bd7..1efec05e0 100644 --- a/src/lib/components/parameters/ScaleAtInstantEdit.svelte +++ b/src/lib/components/parameters/ScaleAtInstantEdit.svelte @@ -272,7 +272,7 @@ <div> <button - class="w-64 text-gray-500 hover:text-le-gris-dispositif" + class="w-64 text-gray-600 hover:text-le-gris-dispositif" on:click={appendBracket} type="button" > diff --git a/src/lib/components/test_cases/TestCaseSummary.svelte b/src/lib/components/test_cases/TestCaseSummary.svelte index 71c0fe442..8808f12e2 100644 --- a/src/lib/components/test_cases/TestCaseSummary.svelte +++ b/src/lib/components/test_cases/TestCaseSummary.svelte @@ -366,7 +366,7 @@ {#if displayMode.edit === undefined} {#if mode === "view"} <button - class="inline-flex items-center text-gray-500 hover:text-black" + class="inline-flex items-center text-gray-600 hover:text-black" on:click={() => (isTestCaseCompareModalOpen = true)} title="Comparer ce cas type avec un autre" id="situation_{situationIndex}_compare" @@ -377,7 +377,7 @@ </button> {/if} <button - class="inline-flex items-center text-gray-500 hover:text-black" + class="inline-flex items-center text-gray-600 hover:text-black" on:click={() => dispatch("changeTestCaseToEditIndex", situationIndex)} title="Éditer ce cas type" id="situation_{situationIndex}_edit" diff --git a/src/lib/components/variables/VariableReferredScaleAtInstant.svelte b/src/lib/components/variables/VariableReferredScaleAtInstant.svelte index f30e949a7..c94e555c4 100644 --- a/src/lib/components/variables/VariableReferredScaleAtInstant.svelte +++ b/src/lib/components/variables/VariableReferredScaleAtInstant.svelte @@ -287,7 +287,7 @@ <div> <button - class="w-64 text-gray-500 hover:text-le-gris-dispositif" + class="w-64 text-gray-600 hover:text-le-gris-dispositif" on:click={appendBracket} type="button" > diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 2fe5d5d80..06f31d8e2 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -607,7 +607,7 @@ class:bg-le-jaune-dark={!displayMode.mobileLaw} class:shadow-inner-={!displayMode.mobileLaw} class:bg-le-jaune-light={displayMode.mobileLaw} - class:text-le-jaune-dark={displayMode.mobileLaw} + class:text-le-jaune-very-dark={displayMode.mobileLaw} href={newSimulationUrl({ ...displayMode, mobileLaw: undefined, @@ -655,7 +655,7 @@ <!-- Bouton de fermeture du dispositif en cours - DESKTOP --> <div class="mx-5 mb-2 hidden justify-end md:flex"> <button - class="inline-flex text-sm uppercase text-gray-400 hover:text-black" + class="inline-flex text-sm uppercase text-gray-600 hover:text-black" on:click={closeParametersEditionPane} >Changer de dispositif <svg @@ -674,7 +674,7 @@ <!-- Bouton de fermeture du dispositif en cours - MOBILE --> <div class="mx-5 mb-2 flex justify-end md:hidden"> <button - class="inline-flex text-sm uppercase text-gray-400 hover:text-black" + class="inline-flex text-sm uppercase text-gray-600 hover:text-black" on:click={closeParametersEditionPane} >Changer de dispositif <svg @@ -721,7 +721,7 @@ --> <div class="mx-5 mb-2 hidden justify-end md:flex"> <button - class="inline-flex text-sm uppercase text-gray-400 hover:text-black" + class="inline-flex text-sm uppercase text-gray-600 hover:text-black" on:click={closeParametersEditionPane} >Changer de dispositif <svg @@ -776,7 +776,7 @@ <ReformsChanges {displayMode} /> </div> <button - class="inline-flex items-center place-self-end text-sm uppercase text-gray-500 hover:text-black" + class="inline-flex items-center place-self-end text-sm uppercase text-gray-600 hover:text-black" on:click={reset} > <Icon class="mr-1 h-4 w-4" icon="ri:refresh-line" /> @@ -788,7 +788,7 @@ {/if} <div class="mx-3 mb-2 mt-5 flex justify-end bg-white md:hidden"> <button - class="inline-flex text-sm uppercase text-gray-400 hover:text-black" + class="inline-flex text-sm uppercase text-gray-600 hover:text-black" on:click={closeParametersEditionPane} >Changer de dispositif <svg @@ -852,7 +852,7 @@ <ReformsChanges {displayMode} /> </div> <button - class="inline-flex items-center place-self-end text-sm uppercase text-gray-500 hover:text-black" + class="inline-flex items-center place-self-end text-sm uppercase text-gray-600 hover:text-black" on:click={reset} > <Icon class="mr-1 h-4 w-4" icon="ri:refresh-line" /> @@ -870,7 +870,7 @@ <!--Partie II modification de la loi - DESKTOP--> <div class="hidden w-1/3 flex-col bg-gray-200 shadow-lg md:flex"> <button - class="ml-2 inline-flex h-10 items-center uppercase text-gray-500 hover:text-black lg:ml-4" + class="ml-2 inline-flex h-10 items-center uppercase text-gray-600 hover:text-black lg:ml-4" on:click={reset} > <Icon class="mr-1 h-4 w-4" icon="ri:refresh-line" /> diff --git a/tailwind.config.cjs b/tailwind.config.cjs index ee60b8a3a..39d4f109f 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -48,7 +48,8 @@ const config = { "le-bleu-light": "#d2dfff", "le-jaune-light": "#EEEA8A", "le-jaune": "#ded500", - "le-jaune-dark": "#a6a00c", + "le-jaune-dark": "#9d970b", + "le-jaune-very-dark": "#6E6A08", "le-rouge-bill": "#ff6b6b", "le-gris-dispositif": "#5E709E", "le-gris-dispositif-ultralight": "#EBEFFA", -- GitLab