diff --git a/packages/frontend/src/components/SyncForm.tsx b/packages/frontend/src/components/SyncForm.tsx index 00dc99a4..87907a0f 100644 --- a/packages/frontend/src/components/SyncForm.tsx +++ b/packages/frontend/src/components/SyncForm.tsx @@ -192,9 +192,17 @@ const syncFormBanner = sva({ justifyContent: "flex-end", w: "100%", maxW: { base: "unset", sm: "800px" }, + h: { base: "56px", lg: "unset" }, px: "15px", }, - back: { ml: "-10px", color: "black", _hover: { bgColor: "transparent" } }, + back: { + ml: "-10px", + color: "black", + _hover: { bgColor: "transparent" }, + "&::before": { + width: "24px !important", + }, + }, label: {}, input: { w: { base: "100%", lg: "100%" }, diff --git a/packages/frontend/src/features/ReportActions.tsx b/packages/frontend/src/features/ReportActions.tsx index 2738e3dd..09d5b87e 100644 --- a/packages/frontend/src/features/ReportActions.tsx +++ b/packages/frontend/src/features/ReportActions.tsx @@ -1,5 +1,5 @@ import { css } from "#styled-system/css"; -import { Stack } from "#styled-system/jsx"; +import { Divider, Stack } from "#styled-system/jsx"; import Button, { ButtonProps } from "@codegouvfr/react-dsfr/Button"; import { forwardRef } from "react"; import { useUser } from "../contexts/AuthContext"; @@ -42,21 +42,30 @@ export const ReportActions = forwardRef {isOwner ? ( - navigate({ to: "/edit/$reportId", params: { reportId: report.id } })} - /> + <> + navigate({ to: "/edit/$reportId", params: { reportId: report.id } })} + /> + + ) : null} {isOwner ? ( - deleteMutation.mutate(report.id)} - /> + <> + deleteMutation.mutate(report.id)} + /> + + ) : null} {report.pdf ? ( - downloadPdfMutation.mutate()} /> + <> + downloadPdfMutation.mutate()} /> + + ) : null} duplicateMutation.mutate()} /> diff --git a/packages/frontend/src/features/menu/ClauseMenu.tsx b/packages/frontend/src/features/menu/ClauseMenu.tsx index 335cbf2b..a52289e0 100644 --- a/packages/frontend/src/features/menu/ClauseMenu.tsx +++ b/packages/frontend/src/features/menu/ClauseMenu.tsx @@ -262,7 +262,7 @@ const ClauseList = ({ clauses, isEditing }: { clauses: ClauseWithIndex[]; isEdit {Object.entries(groupedByKey).map(([key, clauses], index) => ( - + {(clauseNameMap as any)[key] ?? key} @@ -270,7 +270,9 @@ const ClauseList = ({ clauses, isEditing }: { clauses: ClauseWithIndex[]; isEdit ))} - {index < Object.keys(groupedByKey).length - 1 && } + {index < Object.keys(groupedByKey).length - 1 && ( + + )} ))} diff --git a/packages/frontend/src/features/menu/MenuTitle.tsx b/packages/frontend/src/features/menu/MenuTitle.tsx index ccad60e6..3c542ad9 100644 --- a/packages/frontend/src/features/menu/MenuTitle.tsx +++ b/packages/frontend/src/features/menu/MenuTitle.tsx @@ -23,7 +23,7 @@ export const MenuTitle = ({ justifyContent="space-between" alignItems="center" w="100%" - py="16px" + py={{ base: "16px", lg: "30px" }} // mt={{ base: "0", lg: "48px" }} // mb={{ base: "16px", lg: "48px" }} bgColor="white" @@ -59,7 +59,7 @@ export const MenuTitle = ({ {alert ? alert : null} {!hideDivider ? ( - + {buttons ? ( {children} diff --git a/packages/frontend/src/features/menu/Share.tsx b/packages/frontend/src/features/menu/Share.tsx index e17b6fb8..bee354aa 100644 --- a/packages/frontend/src/features/menu/Share.tsx +++ b/packages/frontend/src/features/menu/Share.tsx @@ -42,7 +42,7 @@ export const ShareReport = ({ backButtonOnClick }: { backButtonOnClick: () => vo return ( <> Partage des CR - + Ces personnes peuvent créer, modifier et supprimer vos CR : diff --git a/packages/frontend/src/features/text-editor/TextEditor.tsx b/packages/frontend/src/features/text-editor/TextEditor.tsx index 721bfa68..6d762a60 100644 --- a/packages/frontend/src/features/text-editor/TextEditor.tsx +++ b/packages/frontend/src/features/text-editor/TextEditor.tsx @@ -30,8 +30,9 @@ export const textEditorClassName = css({ minH: "160px", "& > div": { outline: "none", + borderRadius: "0 !important", roundedTop: "md", - borderWidth: "1px", + borderWidth: "0px", h: "100%", minH: "160px", maxHeight: "100%",