From 6d528971b267e38e1e303bba3ad7e64b2ed3437c Mon Sep 17 00:00:00 2001 From: Dorine Lambinet <dorine.lambinet@gmail.com> Date: Mon, 12 Jul 2021 18:03:16 +0200 Subject: [PATCH] Change la couleur de l'espace de contribution : passe du jaune au gris-bleu --- src/lib/components/parameters/NodeEdit.svelte | 10 ++++++---- src/lib/components/parameters/ReferenceEdit.svelte | 6 +++--- src/lib/components/parameters/ReferencesEdit.svelte | 10 +++++----- .../components/parameters/ScaleAtInstantEdit.svelte | 4 ++-- src/lib/components/parameters/ScaleEdit.svelte | 4 ++-- .../components/parameters/ValueAtInstantEdit.svelte | 4 ++-- src/lib/components/parameters/ValueEdit.svelte | 4 ++-- tailwind.config.cjs | 1 + 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/lib/components/parameters/NodeEdit.svelte b/src/lib/components/parameters/NodeEdit.svelte index 2002f5f04..692c43397 100644 --- a/src/lib/components/parameters/NodeEdit.svelte +++ b/src/lib/components/parameters/NodeEdit.svelte @@ -142,7 +142,7 @@ <div class="flex items-center"> <dt class="mt-4"> <input - class="rounded hover:text-le-jaune-dark" + class="rounded hover:text-le-gris-dispositif" max="{new Date().getFullYear() + 20}-01-01" min="1900-01-01" on:change={(event) => changeInstant(index, event)} @@ -153,7 +153,9 @@ <p>{error[0]}</p> {/if} </dt> - <dd class="ml-2 text-xs text-gray-500 hover:text-le-jaune-dark"> + <dd + class="ml-2 text-xs text-gray-500 hover:text-le-gris-dispositif" + > <ReferencesEdit errors={errorAsKeyValueDictionary(error?.[1])} on:change={(event) => changeReferences(index, event)} @@ -169,7 +171,7 @@ > <!-- Material ui icon : delete --> <svg - class="fill-current h-5 w-5 text-gray-500 hover:text-le-jaune-dark " + class="fill-current h-5 w-5 text-gray-500 hover:text-le-gris-dispositif " xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" @@ -187,7 +189,7 @@ <div> <div class="my-4 flex justify-start"> <button - class="inline-flex items-center bg-le-jaune-dark text-white shadow-md hover:bg-blue-900 px-5 rounded p-2 uppercase text-sm" + class="px-5 inline-flex items-center bg-le-gris-dispositif text-white hover:bg-le-gris-dispositif-dark shadow-md rounded p-2 uppercase text-sm" on:click={addInstantReferences} type="button" > diff --git a/src/lib/components/parameters/ReferenceEdit.svelte b/src/lib/components/parameters/ReferenceEdit.svelte index 2649035f0..22cd57fc1 100644 --- a/src/lib/components/parameters/ReferenceEdit.svelte +++ b/src/lib/components/parameters/ReferenceEdit.svelte @@ -61,7 +61,7 @@ <label class="flex-col "> <p class="mt-1">Description</p> {#if reference.title !== oldReference.title} - <s class="font-serif text-sm text-black bg-le-jaune" + <s class="font-serif text-sm text-black bg-le-gris-dispositif-light" >{oldReference.title ?? "absent"}</s > {/if} @@ -78,7 +78,7 @@ <label class="flex-col"> <p class="mt-1 ">Lien URL</p> {#if reference.href !== oldReference.href} - <s class="font-serif text-sm text-black bg-le-jaune" + <s class="font-serif text-sm text-black bg-le-gris-dispositif-light" >{oldReference.href ?? "absent"}</s > {/if} @@ -96,7 +96,7 @@ <label class="flex-col"> <p class="mt-1">Notes</p> {#if reference.note !== oldReference.note} - <s class="font-serif text-sm text-black bg-le-jaune" + <s class="font-serif text-sm text-black bg-le-gris-dispositif-light" >{oldReference.note ?? "absent"}</s > {/if} diff --git a/src/lib/components/parameters/ReferencesEdit.svelte b/src/lib/components/parameters/ReferencesEdit.svelte index 90b94b2e0..6588909b2 100644 --- a/src/lib/components/parameters/ReferencesEdit.svelte +++ b/src/lib/components/parameters/ReferencesEdit.svelte @@ -34,7 +34,7 @@ </script> <section> - <div class="text-sm mt-10 text-black">Références :</div> + <div class="mt-10 text-base text-black">Références :</div> <ul> {#each [...iterArrayWithErrors(references, errors)] as [reference, errorsAtIndex], index} <li class="mr-2 mt-2"> @@ -45,12 +45,12 @@ {showErrors} /> <button - class="py-2 rounded text-gray-500 hover:text-le-jaune-dark" + class="py-2 rounded text-gray-500 hover:text-le-gris-dispositif" on:click={() => deleteReference(index)} title="Supprimer la référence" type="button" > - <div class=" text-xs underline flex items-center"> + <div class="text-sm underline flex items-center"> Supprimer la référence </div> </button> @@ -58,11 +58,11 @@ {/each} </ul> <button - class="text-gray-500 hover:text-le-jaune-dark w-64 " + class=" text-sm text-gray-500 hover:text-le-gris-dispositif w-64 " on:click={appendReference} type="button" > - <div class="mt-4 text-xs flex items-center"> + <div class="mt-4 flex items-center"> <svg class="fill-current inline mr-1" xmlns="http://www.w3.org/2000/svg" diff --git a/src/lib/components/parameters/ScaleAtInstantEdit.svelte b/src/lib/components/parameters/ScaleAtInstantEdit.svelte index effc2b33f..00898bdce 100644 --- a/src/lib/components/parameters/ScaleAtInstantEdit.svelte +++ b/src/lib/components/parameters/ScaleAtInstantEdit.svelte @@ -192,7 +192,7 @@ > <!-- Material ui icon : delete --> <svg - class="fill-current h-5 w-5 text-gray-500 hover:text-le-jaune-dark" + class="fill-current h-5 w-5 text-gray-500 hover:text-le-gris-dispositif" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" @@ -311,7 +311,7 @@ </table> <button - class="text-gray-500 hover:text-le-jaune-dark w-64 " + class="text-gray-500 hover:text-le-gris-dispositif w-64 " on:click={appendBracket} type="button" > diff --git a/src/lib/components/parameters/ScaleEdit.svelte b/src/lib/components/parameters/ScaleEdit.svelte index d021664cf..a77f3582f 100644 --- a/src/lib/components/parameters/ScaleEdit.svelte +++ b/src/lib/components/parameters/ScaleEdit.svelte @@ -189,7 +189,7 @@ > <!-- Material ui icon : delete --> <svg - class="fill-current h-5 w-5 text-gray-500 hover:text-le-jaune-dark" + class="fill-current h-5 w-5 text-gray-500 hover:text-le-gris-dispositif" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" @@ -278,7 +278,7 @@ <div> <div class="my-2 flex justify-start"> <button - class="inline-flex items-center bg-le-jaune-dark text-white shadow-md hover:bg-le-jaune rounded p-2 uppercase text-sm" + class=" inline-flex items-center bg-le-gris-dispositif text-white hover:bg-le-gris-dispositif-dark shadow-md rounded p-2 uppercase text-sm" on:click={addInstantReferencesAndScale} type="button" > diff --git a/src/lib/components/parameters/ValueAtInstantEdit.svelte b/src/lib/components/parameters/ValueAtInstantEdit.svelte index dce30b2a1..1c869c62d 100644 --- a/src/lib/components/parameters/ValueAtInstantEdit.svelte +++ b/src/lib/components/parameters/ValueAtInstantEdit.svelte @@ -80,13 +80,13 @@ {#if oldValueAtInstant === "expected"} <s>absent</s> {:else} - <s class="font-serif text-base text-black bg-le-jaune" + <s class="font-serif text-base text-black bg-le-gris-dispositif-light" >{asMaybeNumberValue(oldValueAtInstant).value ?? "absent"}</s > {/if} {/if} <input - class=" text-black hover:bg-le-jaune font-serif text-lg border-b border-t-0 border-l-0 border-r-0 px-2 py-0 mt-1 w-24" + class=" text-black hover:bg-le-gris-dispositif-light font-serif text-lg border-b border-t-0 border-l-0 border-r-0 px-2 py-0 mt-1 w-24" step="any" type="number" on:change={changeValue} diff --git a/src/lib/components/parameters/ValueEdit.svelte b/src/lib/components/parameters/ValueEdit.svelte index 31139fc03..f5b96ab79 100644 --- a/src/lib/components/parameters/ValueEdit.svelte +++ b/src/lib/components/parameters/ValueEdit.svelte @@ -144,7 +144,7 @@ > <!-- Material ui icon : delete --> <svg - class="fill-current h-5 w-5 text-gray-500 hover:text-le-jaune-dark " + class="fill-current h-5 w-5 text-gray-500 hover:text-le-gris-dispositif " xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" @@ -232,7 +232,7 @@ <div> <div class="my-2 flex justify-start"> <button - class="inline-flex items-center bg-le-jaune-dark text-white shadow-md hover:bg-le-jaune rounded p-2 uppercase text-sm" + class="inline-flex items-center bg-le-gris-dispositif text-white hover:bg-le-gris-dispositif-dark shadow-md rounded p-2 uppercase text-sm" on:click={addInstantReferencesAndValue} type="button" > diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 596fb342a..175399ebe 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -30,6 +30,7 @@ module.exports = { "le-rouge-pjl": "#ff6b6b", "le-gris-dispositif": "#5E709E", "le-gris-dispositif-light": "#CCD3E7", + "le-gris-dispositif-dark": "#2F406A", white: colors.white, }, }, -- GitLab