Skip to content

Commit

Permalink
Corrections pour homogénéiser les champs des formulaires
Browse files Browse the repository at this point in the history
  • Loading branch information
mariheck committed Jun 28, 2024
1 parent 1ac5507 commit 163344b
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 36 deletions.
2 changes: 1 addition & 1 deletion packages/ui/src/design-system/Field/Field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const Field = ({
}: Props) => {
return (
<div className={classNames(`flex-grow flex flex-col gap-3`, className)}>
<label htmlFor={htmlFor}>
<label htmlFor={htmlFor} className="ml-0 mb-0">
{/** Title */}
<div
className={classNames('font-medium text-grey-8', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
exports[`design-system/Field Default smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand All @@ -22,7 +24,9 @@ exports[`design-system/Field Default smoke-test 1`] = `
exports[`design-system/Field DisabledWithHint smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8 text-grey-5">
Description de l'action
</div>
Expand Down Expand Up @@ -50,7 +54,9 @@ exports[`design-system/Field DisabledWithHint smoke-test 1`] = `
exports[`design-system/Field WithError smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand All @@ -76,7 +82,9 @@ exports[`design-system/Field WithError smoke-test 1`] = `
exports[`design-system/Field WithHint smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand All @@ -103,7 +111,9 @@ exports[`design-system/Field WithHint smoke-test 1`] = `
exports[`design-system/Field WithInfo smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand All @@ -129,7 +139,9 @@ exports[`design-system/Field WithInfo smoke-test 1`] = `
exports[`design-system/Field WithSuccess smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand All @@ -155,7 +167,9 @@ exports[`design-system/Field WithSuccess smoke-test 1`] = `
exports[`design-system/Field WithWarning smoke-test 1`] = `
<div class="flex">
<div class="flex-grow flex flex-col gap-3">
<label for="un_nom">
<label for="un_nom"
class="ml-0 mb-0"
>
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ exports[`design-system/FormSection AvecFields smoke-test 1`] = `
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
<div class="flex-grow flex flex-col gap-3 md:col-span-2">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Titre du plan
</div>
Expand All @@ -52,7 +52,7 @@ exports[`design-system/FormSection AvecFields smoke-test 1`] = `
</div>
</div>
<div class="flex-grow flex flex-col gap-3">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Statut
</div>
Expand All @@ -70,7 +70,7 @@ exports[`design-system/FormSection AvecFields smoke-test 1`] = `
</div>
</div>
<div class="flex-grow flex flex-col gap-3">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Niveaude priorité
</div>
Expand Down Expand Up @@ -152,7 +152,7 @@ exports[`design-system/FormSection PlusieursSections smoke-test 1`] = `
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
<div class="flex-grow flex flex-col gap-3 md:col-span-2">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Titre du plan
</div>
Expand All @@ -164,7 +164,7 @@ exports[`design-system/FormSection PlusieursSections smoke-test 1`] = `
</div>
</div>
<div class="flex-grow flex flex-col gap-3">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Statut
</div>
Expand All @@ -182,7 +182,7 @@ exports[`design-system/FormSection PlusieursSections smoke-test 1`] = `
</div>
</div>
<div class="flex-grow flex flex-col gap-3">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Niveaude priorité
</div>
Expand Down Expand Up @@ -213,7 +213,7 @@ exports[`design-system/FormSection PlusieursSections smoke-test 1`] = `
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
<div class="flex-grow flex flex-col gap-3 md:col-span-2">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Titre du plan
</div>
Expand All @@ -233,7 +233,7 @@ exports[`design-system/FormSection SansHeader smoke-test 1`] = `
<div class="w-full max-w-lg p-8">
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
<div class="flex-grow flex flex-col gap-3 md:col-span-2">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Titre du plan
</div>
Expand All @@ -245,7 +245,7 @@ exports[`design-system/FormSection SansHeader smoke-test 1`] = `
</div>
</div>
<div class="flex-grow flex flex-col gap-3 md:col-span-2">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Statut
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`design-system/Select CreateOption smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -27,7 +27,7 @@ exports[`design-system/Select CustomItem smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -47,7 +47,7 @@ exports[`design-system/Select Default smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -67,7 +67,7 @@ exports[`design-system/Select Disabled smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
disabled
type="button"
>
Expand All @@ -88,7 +88,7 @@ exports[`design-system/Select DisabledOption smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -114,7 +114,7 @@ exports[`design-system/Select DisabledSearchableMultiSelectWithValue smoke-test
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
disabled
type="button"
>
Expand Down Expand Up @@ -149,7 +149,7 @@ exports[`design-system/Select Filter smoke-test 1`] = `
<div class="flex flex-col gap-6">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -164,7 +164,7 @@ exports[`design-system/Select Filter smoke-test 1`] = `
</button>
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -179,7 +179,7 @@ exports[`design-system/Select Filter smoke-test 1`] = `
</button>
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -200,7 +200,7 @@ exports[`design-system/Select MultiSelectWithSectionOptions smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -220,7 +220,7 @@ exports[`design-system/Select SearchableMultiSelect smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -243,7 +243,7 @@ exports[`design-system/Select SearchableSelectWithDebouncedApiCallOnTyping smoke
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -266,7 +266,7 @@ exports[`design-system/Select SmallWithBadgeItems smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[2.5rem] py-1">
Expand All @@ -285,7 +285,7 @@ exports[`design-system/Select SmallWithBadgeItems smoke-test 1`] = `
exports[`design-system/Select WithField smoke-test 1`] = `
<div class="w-full max-w-[24rem]">
<div class="flex-grow flex flex-col gap-3">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Description de l'action
</div>
Expand All @@ -295,7 +295,7 @@ exports[`design-system/Select WithField smoke-test 1`] = `
</label>
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand Down Expand Up @@ -327,14 +327,14 @@ exports[`design-system/Select ZIndex smoke-test 1`] = `
class="absolute inset-0 z-20 bg-pink-100"
>
<div class="flex-grow flex flex-col gap-3">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Exemple
</div>
</label>
<button aria-expanded="false"
aria-label="ouvrir le menu"
class="w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
class="w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden"
type="button"
>
<div class="flex px-4 min-h-[3rem] py-2">
Expand All @@ -349,7 +349,7 @@ exports[`design-system/Select ZIndex smoke-test 1`] = `
</button>
</div>
<div class="flex-grow flex flex-col gap-3 relative mt-6">
<label>
<label class="ml-0 mb-0">
<div class="font-medium text-grey-8">
Devrait être sous les options du select
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const SelectButton = forwardRef(
aria-expanded={isOpen}
aria-label="ouvrir le menu"
className={classNames(
'w-full rounded-xl border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden',
'w-full rounded-lg border border-solid border-grey-4 disabled:border-grey-3 bg-grey-1 hover:!bg-primary-0 disabled:hover:!bg-grey-1 overflow-hidden',
{'rounded-b-none': isOpen}
)}
disabled={disabled}
Expand Down

0 comments on commit 163344b

Please sign in to comment.