From f7fba89e6668c089ebd876bc3efbb58d15efcda5 Mon Sep 17 00:00:00 2001 From: Tamara Date: Sun, 5 May 2024 00:33:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=82=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=20-=20=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/assets/icons/NameplateLogo.tsx | 36 +++++++++----- .../ContactForm/ContactForm.tsx | 22 ++++----- .../ViewPublicationPage/ResultForm.tsx | 12 +---- .../StartPageDesktop.tsx | 2 +- .../StartPageViewPublication/index.tsx | 47 ++++++++++--------- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/lib/assets/icons/NameplateLogo.tsx b/lib/assets/icons/NameplateLogo.tsx index 97323b2..1338a72 100644 --- a/lib/assets/icons/NameplateLogo.tsx +++ b/lib/assets/icons/NameplateLogo.tsx @@ -1,18 +1,28 @@ import { FC, SVGProps } from "react"; export const NameplateLogo: FC> = (props) => ( - - - - - + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx index b09cbd8..2fdc158 100644 --- a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx +++ b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx @@ -357,17 +357,17 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { : "#FFFFFF", }} /> - - Сделано на PenaQuiz - + {/**/} + {/* Сделано на PenaQuiz*/} + {/**/} )} diff --git a/lib/components/ViewPublicationPage/ResultForm.tsx b/lib/components/ViewPublicationPage/ResultForm.tsx index 05c467e..68169ca 100644 --- a/lib/components/ViewPublicationPage/ResultForm.tsx +++ b/lib/components/ViewPublicationPage/ResultForm.tsx @@ -196,17 +196,7 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => { : "#F5F7FF", }} /> - - Сделано на PenaQuiz - + )} diff --git a/lib/components/ViewPublicationPage/StartPageViewPublication/StartPageDesktop.tsx b/lib/components/ViewPublicationPage/StartPageViewPublication/StartPageDesktop.tsx index 4527c59..317a73f 100644 --- a/lib/components/ViewPublicationPage/StartPageViewPublication/StartPageDesktop.tsx +++ b/lib/components/ViewPublicationPage/StartPageViewPublication/StartPageDesktop.tsx @@ -181,7 +181,7 @@ const CenteredLayout = ({ { alignItems: "center", flexWrap: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center"? "nowrap" : "wrap", gap: isMobile? "20px" : "30px", - mb: settings.cfg.startpageType === "centered" ? isMobile? "20px" : "25px" : "7px", + mb: settings.cfg.startpageType === "centered" ? isMobile? "20px" : "25px" : settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center" &&!isMobile ? 0 : "7px", justifyContent: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center" && isMobile? "center" : undefined }} > @@ -104,7 +104,7 @@ export const StartPageViewPublication = () => { src={settings.cfg.startpage.logo} style={{ maxHeight: isMobile? "30px" : "40px", - maxWidth: "110px", + maxWidth: isMobile? "100px" : "110px", objectFit: "cover", }} alt="" @@ -137,7 +137,7 @@ export const StartPageViewPublication = () => { alignItems: "center", gap: "7px", textDecoration: "none", - marginLeft: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center" && !isTablet &&!isMobile ? "50px" : undefined + marginLeft: settings.cfg.startpageType === "expanded" && settings.cfg.startpage.position === "center" && !isTablet &&!isMobile ? "61px" : undefined }} > { : "#FFFFFF", }} /> - - Сделано на PenaQuiz - + {/**/} + {/* Сделано на PenaQuiz*/} + {/**/} ) const realQuestionsCount = questions.filter((question) => question.type !== null && question.type !== "result").length; @@ -178,11 +178,11 @@ export const StartPageViewPublication = () => { width: "100%", background: settings.cfg.startpageType === "expanded" - ? settings.cfg.startpage.position === "left" + ? settings.cfg.startpage.position === "left" || isMobile && settings.cfg.startpage.position === "left" || isMobile && settings.cfg.startpage.position === "right" ? "linear-gradient(90deg, rgba(39, 38, 38, 0.95) 7.66%, rgba(42, 42, 46, 0.85) 42.12%, rgba(51, 54, 71, 0.4) 100%)" : settings.cfg.startpage.position === "center" ? "linear-gradient(0deg, rgba(39, 38, 38, 0.95) 7.66%, rgba(42, 42, 46, 0.85) 42.12%, rgba(51, 54, 71, 0.4) 100%)" - : "linear-gradient(90deg, rgba(39, 38, 38, 0.95) 7.66%, rgba(42, 42, 46, 0.85) 42.12%, rgba(51, 54, 71, 0.4) 100%)" + : "linear-gradient(-90deg, rgba(39, 38, 38, 0.95) 7.66%, rgba(42, 42, 46, 0.85) 42.12%, rgba(51, 54, 71, 0.4) 100%)" : theme.palette.background.default, color: settings.cfg.startpageType === "expanded" ? "white" : "black", @@ -207,17 +207,17 @@ export const StartPageViewPublication = () => { ? "center" : "start" : "start", - marginTop: settings.cfg.startpageType === "centered" ? "30px" : "5px", + marginTop: settings.cfg.startpageType === "centered" ? "30px" : isMobile ? "0px" : "5px", maxWidth: isMobile? "100%" : settings.cfg.startpageType === "centered" ? "700px" : isTablet && settings.cfg.startpageType !== "expanded" && settings.cfg.startpage.position !== "center" ? "380px" : "531px", }} > {