From 8481376f7b5a90ac256edf7153c154541c5ba9fe Mon Sep 17 00:00:00 2001 From: Mihoub <debache.mihoub@gmail.com> Date: Mon, 28 Oct 2024 15:49:20 +0100 Subject: [PATCH] fix(last-mails-sent): switch a to link and add margin in edit modal --- client/src/components/edit-modal/index.tsx | 2 +- client/src/components/items/styles.scss | 1 + .../pages/last-mails-sent/components/item.tsx | 26 ++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/client/src/components/edit-modal/index.tsx b/client/src/components/edit-modal/index.tsx index b84c728..1b9099e 100644 --- a/client/src/components/edit-modal/index.tsx +++ b/client/src/components/edit-modal/index.tsx @@ -216,7 +216,7 @@ const EditModal: React.FC<EditModalProps> = ({ onClick={handleOpenTagModal} variant="secondary" size="sm" - className="fr-mt-2w" + className="fr-mt-2w fr-mb-2w" > Sélectionner des tags </Button> diff --git a/client/src/components/items/styles.scss b/client/src/components/items/styles.scss index 8fb66cd..492c77f 100644 --- a/client/src/components/items/styles.scss +++ b/client/src/components/items/styles.scss @@ -24,6 +24,7 @@ margin-right: 50px; margin-top: 10px; margin-bottom: 10px; + word-wrap: break-word; } .staffSide { diff --git a/client/src/pages/last-mails-sent/components/item.tsx b/client/src/pages/last-mails-sent/components/item.tsx index b791b29..d5a0696 100644 --- a/client/src/pages/last-mails-sent/components/item.tsx +++ b/client/src/pages/last-mails-sent/components/item.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Badge, Col, Text, Title } from "@dataesr/dsfr-plus"; +import { Badge, Col, Link, Text } from "@dataesr/dsfr-plus"; import { FaCopy } from "react-icons/fa"; import "./styles.scss"; import { LastMailsSentProps } from "../../../types"; @@ -54,16 +54,22 @@ const LastMailsSentItem: React.FC<LastMailsSentProps> = ({ data }) => { </div> <div className="email-content"> - <Title look="h6" as="h3" className="fr-mb-0"> - Réponse de <i>{email.selectedProfile}</i> à{" "} - <i> - {email?.name} ({email?.to}) - </i> - </Title> + <Text className="fr-mb-0"> + Réponse de{" "} + <strong> + <i>{email.selectedProfile}</i> + </strong>{" "} + à{" "} + <strong> + <i> + {email?.name} ({email?.to}) + </i> + </strong> + </Text> <Text size="sm"> - <a href={link} target="_blank" rel="noopener noreferrer"> - <i>{email?.contributionId}</i> - </a> + <Link href={link} rel="noopener noreferrer"> + Voir la contribution <i>{email?.contributionId}</i> + </Link> <button className={`copy-button ${ copiedId === email.contributionId ? "copied" : ""