From 0f8b448a65abaa9411cde9fe9e0662fa80232b76 Mon Sep 17 00:00:00 2001 From: Nastya Date: Fri, 5 Jan 2024 08:21:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=9A=20=D0=BD=D0=B0=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B1=D0=B8=D0=BB=D0=BA=D0=B5=20=D0=B2=20=D0=BE=D0=BA=D0=BE?= =?UTF-8?q?=D1=88=D0=BA=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?= =?UTF-8?q?=D0=BA=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BF=D0=BE=D0=BC?= =?UTF-8?q?=D0=B5=D1=89=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9,=20+=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5=D0=BA?= =?UTF-8?q?=D1=81=D0=B0=D1=80=D0=B5=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ContactFormPage/ContactFormPage.tsx | 5 ++++- .../ContactFormPage/NewField/WindowNewField.tsx | 1 + src/pages/ViewPublicationPage/ResultForm.tsx | 17 ++++++++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/pages/ContactFormPage/ContactFormPage.tsx b/src/pages/ContactFormPage/ContactFormPage.tsx index 0633381b..19b380f3 100644 --- a/src/pages/ContactFormPage/ContactFormPage.tsx +++ b/src/pages/ContactFormPage/ContactFormPage.tsx @@ -190,7 +190,10 @@ function ContactFormParent({ outerContainerSx: sx, children }: Props) { rows={8} placeholder="Дополнительный текст формы" sxForm={{ - height: "287px", + height: "197px", + }} + sx={{ + height: "197px" }} maxLength={300} /> diff --git a/src/pages/ContactFormPage/NewField/WindowNewField.tsx b/src/pages/ContactFormPage/NewField/WindowNewField.tsx index 7ccdcdf6..2162691b 100644 --- a/src/pages/ContactFormPage/NewField/WindowNewField.tsx +++ b/src/pages/ContactFormPage/NewField/WindowNewField.tsx @@ -122,6 +122,7 @@ export default function WindowNewField({ drawerState, closeDrawer }: Props) { padding: "20px", display: "flex", gap: "10px", + flexWrap: "wrap" }} > {buttonSetting.flatMap((e, i) => diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx index 4b83548b..c656de92 100644 --- a/src/pages/ViewPublicationPage/ResultForm.tsx +++ b/src/pages/ViewPublicationPage/ResultForm.tsx @@ -93,13 +93,16 @@ export const ResultForm = ({ )} - - {resultQuestion.title || "Форма результатов"} - + {resultQuestion.title && + + {resultQuestion.title} + + } + {resultQuestion.content.text !== "" && resultQuestion.content.text !== " " && (