diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/variables/VariableReferredScaleParameter.svelte index b75d8bd04246c701de855fa7d460794daf94cc2b..7cffef1d6e5f55aab0bcf1982612ca204cdce3d1 100644 --- a/src/lib/components/variables/VariableReferredScaleParameter.svelte +++ b/src/lib/components/variables/VariableReferredScaleParameter.svelte @@ -177,16 +177,10 @@ href="/parameters/{billParameter.name}" target="_blank" > - <!--Remixicon.com - history-fill --> - <svg - aria-hidden="true" - class="mr-1 inline h-4 w-4 fill-current stroke-transparent text-gray-600" - viewBox="0 0 24 24" - xmlns="http://www.w3.org/2000/svg" - ><path - d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12h2c0 4.418 3.582 8 8 8s8-3.582 8-8-3.582-8-8-8C9.536 4 7.332 5.114 5.865 6.865L8 9H2V3l2.447 2.446C6.28 3.336 8.984 2 12 2zm1 5v4.585l3.243 3.243-1.415 1.415L11 12.413V7h2z" - /></svg - >Historique</a + <Icon + class="mr-1 inline-flex h-4 w-4" + icon="ri-history-line" + />Historique</a > </div> </div> @@ -197,22 +191,29 @@ {#if (billReferences !== undefined && billReferences.length > 0) || ["impot_revenu.bareme_ir_depuis_1945.bareme"].includes(billParameter.name)} <!--Référence législative--> <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2"> - <p class="pb-2 text-sm"> - Barème depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} - </p> - <ul class="text-xs"> + <div> + <p class="pb-2 text-xs"> + Barème en vigueur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} : + </p> + </div> + <ul> {#each billReferences as { href, note, title }} - <li class="text-sm"> - {#if href === undefined}<p class="inline-flex items-center"> - <Icon class="mr-1 h-4 w-4" icon="ri-file-text-line" />{title} + <li class="text-xs"> + {#if href === undefined}<p class="text-left"> + <Icon + class="mr-1 inline-flex h-4 w-4" + icon="ri-file-text-line" + />{title} </p>{:else} <button - class="link inline-flex items-center" + class="link text-left" on:click={() => (isArticleModalOpen = true)} title="Voir le paramètre dans l'article de loi" > - <Icon class="mr-1 h-4 w-4" icon="ri-file-text-line" />{title ?? - "Source"} + <Icon + class="mr-1 inline-flex h-4 w-4" + icon="ri-file-text-line" + />{title ?? "Source"} </button> {/if} {#if note} diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/variables/VariableReferredValueParameter.svelte index ebd917e55af937a28cb8df9621282da10a5a549a..ce17f4835be89c22e7be78241b257f8c7c1ee726 100644 --- a/src/lib/components/variables/VariableReferredValueParameter.svelte +++ b/src/lib/components/variables/VariableReferredValueParameter.svelte @@ -202,44 +202,42 @@ {#if billReferences !== undefined && billReferences.length > 0} <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2"> <!--Date du paramètre--> - <p class="pb-2 text-sm"> - Valeur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} + <p class="pb-2 text-xs"> + Valeur en vigueur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} : </p> {#if (billLegalReferences ?? []).length > 0 || ["impot_revenu.calcul_impot_revenu.plaf_qf.general", "impot_revenu.calcul_impot_revenu.plaf_qf.celib", "impot_revenu.calcul_impot_revenu.plaf_qf.celib_enf", "impot_revenu.calcul_impot_revenu.plaf_qf.reduc_postplafond", "impot_revenu.calcul_impot_revenu.plaf_qf.reduc_postplafond_veuf", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.plaf_GuadMarReu", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.plaf_GuyMay", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.taux_GuadMarReu", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.taux_GuyMay", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.seuil_celib", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.seuil_couple", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.taux", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.inv2", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.conj", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.enf1", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.enf2", "impot_revenu.calcul_revenus_imposables.abat_rni.enfant_marie.montant", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.inv1", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.isol"].includes(billParameter.name)} - <div class="mt-2"> - <span class=""> - {#each billReferences as { href, note, title }} - <li class=" text-sm "> - {#if href === undefined}<p class="inline-flex items-center"> - <Icon - class="mr-1 h-4 w-4" - icon="ri-file-text-line" - />{title} - </p>{:else} - <button - class="link inline-flex items-center " - on:click={() => (isArticleModalOpen = true)} - title="Voir le paramètre dans l'article de loi" - > - <Icon - class="mr-1 h-4 w-4" - icon="ri-file-text-line" - />{title ?? "Référence législative sans titre"} - </button> - {/if} - {#if note} - <p>{note}</p> - {/if} - </li> - {/each}</span - > - <ArticleModal - {billLegalReferences} - {billParameter} - bind:isOpen={isArticleModalOpen} - /> - </div> + <ul> + {#each billReferences as { href, note, title }} + <li class="text-xs"> + {#if href === undefined}<p class="text-left"> + <Icon + class="mr-1 inline-flex h-4 w-4" + icon="ri-file-text-line" + />{title} + </p>{:else} + <button + class="link text-left" + on:click={() => (isArticleModalOpen = true)} + title="Voir le paramètre dans l'article de loi" + > + <Icon + class="mr-1 inline-flex h-4 w-4" + icon="ri-file-text-line" + />{title ?? "Référence législative sans titre"} + </button> + {/if} + {#if note} + <p>{note}</p> + {/if} + </li> + {/each} + </ul> + <ArticleModal + {billLegalReferences} + {billParameter} + bind:isOpen={isArticleModalOpen} + /> {/if} </div> {/if}