diff --git a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx index f091016..990b34c 100644 --- a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx +++ b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx @@ -189,175 +189,172 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { yandexMetrics.contactsFormOpened(); }, []); - return ( - 500 ? "100%" : "auto", - overflow: "auto", - "&::-webkit-scrollbar": { - width: "0", - display: "none", - msOverflowStyle: "none", - }, - scrollbarWidth: "none", - msOverflowStyle: "none", - backgroundPosition: "center", - backgroundSize: "cover", - backgroundImage: - settings.cfg.design && !isMobile - ? quizThemes[settings.cfg.theme].isLight - ? `url(${DESIGN_LIST[settings.cfg.theme]})` - : `linear-gradient(90deg, #272626, transparent), url(${DESIGN_LIST[settings.cfg.theme] - })` - : null, - }} - > - - + return ( - - - - - - { - setReady(target.checked); - }} - checked={ready} - colorIcon={theme.palette.primary.main} - sx={{ marginRight: "0" }} - /> - - С  - - Положением об обработке персональных данных{" "} - -  и  - - {" "} - Политикой конфиденциальности{" "} - -  ознакомлен - - - - - - {show_badge && ( - - 500 ? "100%" : "auto", + overflow: "auto", + "&::-webkit-scrollbar": { + width: "0", + display: "none", + msOverflowStyle: "none", + }, + scrollbarWidth: "none", + msOverflowStyle: "none", + backgroundPosition: "center", + backgroundSize: "cover", + backgroundImage: + settings.cfg.design && !isMobile + ? quizThemes[settings.cfg.theme].isLight + ? `url(${DESIGN_LIST[settings.cfg.theme]})` + : `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%), url(${DESIGN_LIST[settings.cfg.theme] + })` + : null, + }} + > + + > + + + + + + + + { + setReady(target.checked); + }} + checked={ready} + colorIcon={theme.palette.primary.main} + sx={{marginRight: "0"}} + /> + + С  + + Положением об обработке персональных + данных{" "} + +  и  + + {" "} + Политикой конфиденциальности{" "} + +  ознакомлен + + + + + + {show_badge && ( + + + + )} + - )} - - - ); + ); }; diff --git a/lib/components/ViewPublicationPage/ContactForm/ContactTextBlock/index.tsx b/lib/components/ViewPublicationPage/ContactForm/ContactTextBlock/index.tsx index b8263e6..e76fda9 100644 --- a/lib/components/ViewPublicationPage/ContactForm/ContactTextBlock/index.tsx +++ b/lib/components/ViewPublicationPage/ContactForm/ContactTextBlock/index.tsx @@ -14,7 +14,7 @@ export const ContactTextBlock: FC = ({settings}) => { return ( = ({settings}) => { > >; } -export const CountrySelector:FC = ({setMask}) => { +export const CountrySelector: FC = ({setMask}) => { const theme = useTheme(); const [country, setCountry] = useState('RU'); @@ -25,6 +25,8 @@ export const CountrySelector:FC = ({setMask}) => { PaperProps: { style: { backgroundColor: theme.palette.background.default, + borderRadius: '12px', + scrollbarWidth: "none", }, }, }} @@ -56,7 +58,8 @@ export const CountrySelector:FC = ({setMask}) => { }} > {Object.keys(phoneMasksByCountry).map((countryCode) => { - return {phoneMasksByCountry[countryCode][0]} + return {phoneMasksByCountry[countryCode][0]} })} ); diff --git a/lib/components/ViewPublicationPage/ResultForm.tsx b/lib/components/ViewPublicationPage/ResultForm.tsx index ad83ace..a1f707d 100644 --- a/lib/components/ViewPublicationPage/ResultForm.tsx +++ b/lib/components/ViewPublicationPage/ResultForm.tsx @@ -38,234 +38,246 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => { yandexMetrics.resultIdShown(resultQuestion.id); }, []); - return ( - - + return ( - - Ваш результат: - - - - {!resultQuestion?.content.useImage && - resultQuestion.content.video && ( - - )} - {resultQuestion?.content.useImage && resultQuestion.content.back && ( - + + + + Ваш результат: + + + + {!resultQuestion?.content.useImage && + resultQuestion.content.video && ( + + )} + {resultQuestion?.content.useImage && + resultQuestion.content.back && ( + + resultImage + + )} + {resultQuestion.description !== "" && + resultQuestion.description !== " " && ( + + {resultQuestion.description} + + )} + + + {resultQuestion.title} + + + {resultQuestion.content.text !== "" && + resultQuestion.content.text !== " " && ( + + {resultQuestion.content.text} + + )} + + + {show_badge && ( + + + + )} + + {settings.cfg.resultInfo.showResultForm === "before" && + !settings.cfg.score && ( + + )} + {settings.cfg.resultInfo.showResultForm === "after" && + resultQuestion.content.redirect && ( + + )} + - )} - {resultQuestion.description !== "" && - resultQuestion.description !== " " && ( - - {resultQuestion.description} - - )} - - - {resultQuestion.title} - - - {resultQuestion.content.text !== "" && - resultQuestion.content.text !== " " && ( - - {resultQuestion.content.text} - - )} - - - - {show_badge && ( - - - - )} - - - - {settings.cfg.resultInfo.showResultForm === "before" && - !settings.cfg.score && ( - - )} - {settings.cfg.resultInfo.showResultForm === "after" && - resultQuestion.content.redirect && ( - - )} - - - - - ); + ); };