From 6accc0adcdb383680cd1ff5ceee32d08fde9938a Mon Sep 17 00:00:00 2001 From: Max S Date: Mon, 16 Sep 2024 17:38:19 +0200 Subject: [PATCH 1/2] :hammer: update modals --- .../DesignSystem/Modal/classes.module.scss | 5 ++- .../AddClientToFolder/classes.module.scss | 2 +- .../ParameterDocuments/classes.module.scss | 11 ++--- .../AskDocuments/ParameterDocuments/index.tsx | 45 ++++++++++--------- .../Folder/AskDocuments/classes.module.scss | 2 +- .../Layouts/Folder/AskDocuments/index.tsx | 4 +- .../ClientView/classes.module.scss | 10 +++++ 7 files changed, 46 insertions(+), 33 deletions(-) diff --git a/src/front/Components/DesignSystem/Modal/classes.module.scss b/src/front/Components/DesignSystem/Modal/classes.module.scss index 4d58af84..66c25655 100644 --- a/src/front/Components/DesignSystem/Modal/classes.module.scss +++ b/src/front/Components/DesignSystem/Modal/classes.module.scss @@ -7,7 +7,7 @@ left: 0; width: 100%; height: 100%; - z-index: 3; + z-index: 5; .content { position: fixed; @@ -54,7 +54,8 @@ left: 0; width: 100%; height: 100%; - background-color: rgba(0, 0, 0, 0.5); + opacity: 0.3; + background: var(--primary-default-deep, #013391); overflow: hidden; } } diff --git a/src/front/Components/Layouts/Folder/AddClientToFolder/classes.module.scss b/src/front/Components/Layouts/Folder/AddClientToFolder/classes.module.scss index d51866e2..d8680d4f 100644 --- a/src/front/Components/Layouts/Folder/AddClientToFolder/classes.module.scss +++ b/src/front/Components/Layouts/Folder/AddClientToFolder/classes.module.scss @@ -40,7 +40,7 @@ .cancel-button { display: flex; - margin-right: 32px; + margin-right: var(--spacing-md, 16px); } @media (max-width: $screen-m) { diff --git a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss index 4ed9ba68..e484df2b 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss +++ b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/classes.module.scss @@ -1,11 +1,12 @@ -.add-document-form-container { +.root { display: flex; flex-direction: column; - gap: 24px; + gap: var(--spacing-md, 16px); + width: 566px; .radiobox-container { - > :not(:last-child) { - margin-bottom: 16px; - } + display: flex; + flex-direction: column; + gap: var(--spacing-xs, 8px); } } diff --git a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx index b78b5d0b..36ad03be 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx @@ -4,6 +4,7 @@ import { IOption } from "@Front/Components/DesignSystem/Dropdown/DropdownMenu/Dr import AutocompleteMultiSelectField from "@Front/Components/DesignSystem/Form/AutocompleteMultiSelectField"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; +import Modal from "@Front/Components/DesignSystem/Modal"; import Confirm from "@Front/Components/DesignSystem/OldModal/Confirm"; import RadioBox from "@Front/Components/DesignSystem/RadioBox"; import { DocumentType, OfficeFolder } from "le-coffre-resources/dist/Notary"; @@ -117,32 +118,32 @@ export default function ParameterDocuments(props: IProps) { }, [getAvailableDocuments, props.folder]); return ( - -
+ firstButton={{ children: "Annuler", onClick: handleClose }} + secondButton={{ children: "Ajouter", onClick: addDocument }} + title={"Ajouter un document"}> +
- + - +
+ + {addOrEditDocument === "add" && ( <> @@ -162,6 +163,6 @@ export default function ParameterDocuments(props: IProps) { /> )}
- + ); } diff --git a/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss b/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss index cc4cfae8..dcdf2dd8 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss +++ b/src/front/Components/Layouts/Folder/AskDocuments/classes.module.scss @@ -33,7 +33,7 @@ .buttons-container { display: flex; - gap: 32px; + gap: var(--spacing-md, 16px); margin-top: 32px; @media (max-width: $screen-s) { diff --git a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx index 8a5f1dde..30f2d87f 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx @@ -155,7 +155,7 @@ export default function AskDocuments() {
- +
diff --git a/src/front/Components/Layouts/Folder/FolderInformation/ClientView/classes.module.scss b/src/front/Components/Layouts/Folder/FolderInformation/ClientView/classes.module.scss index 531ab7bc..43df7a3a 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/ClientView/classes.module.scss +++ b/src/front/Components/Layouts/Folder/FolderInformation/ClientView/classes.module.scss @@ -16,6 +16,16 @@ $mobile-breakpoint: 664px; .tabs { width: calc(100% - 210px); } + + border-bottom: 1px solid var(--tabs-stroke); + + > :first-child { + margin-bottom: -1px; + } + + > :last-child { + margin-bottom: -1px; + } } .content { From 109a0f98ddc9ee66edf867b110b35ab7dc5cea3b Mon Sep 17 00:00:00 2001 From: Max S Date: Mon, 16 Sep 2024 17:43:43 +0200 Subject: [PATCH 2/2] remove unused import --- .../AskDocuments/ParameterDocuments/index.tsx | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx index 36ad03be..7b457cfa 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/AskDocuments/ParameterDocuments/index.tsx @@ -5,7 +5,6 @@ import AutocompleteMultiSelectField from "@Front/Components/DesignSystem/Form/Au import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; import Modal from "@Front/Components/DesignSystem/Modal"; -import Confirm from "@Front/Components/DesignSystem/OldModal/Confirm"; import RadioBox from "@Front/Components/DesignSystem/RadioBox"; import { DocumentType, OfficeFolder } from "le-coffre-resources/dist/Notary"; import { ChangeEvent, useCallback, useEffect, useState } from "react"; @@ -126,24 +125,23 @@ export default function ParameterDocuments(props: IProps) { title={"Ajouter un document"}>
- + - +
- {addOrEditDocument === "add" && ( <>