diff --git a/package.json b/package.json index 8cd4aeec..72f7056b 100755 --- a/package.json +++ b/package.json @@ -109,6 +109,6 @@ "bracketSpacing": true, "arrowParens": "always", "jsxSingleQuote": false, - "singleAttributePerLine": false + "singleAttributePerLine": true } } diff --git a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewDesktop.tsx b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewDesktop.tsx index 8ee1449e..2d38942a 100644 --- a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewDesktop.tsx +++ b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewDesktop.tsx @@ -114,6 +114,7 @@ export default function BannerWidgetPreviewDesktop({ height: "calc(18.57 / 29.5 * 100%)", ml: "calc(7.36 / 196 * 100%)", aspectRatio: 1, + color: buttonTextColor, }} /> - + {appealText || "Пройти тест"} - + {quizHeaderText || "Заголовок теста"} diff --git a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewMobile.tsx b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewMobile.tsx index 41ce7fe0..47a26914 100644 --- a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewMobile.tsx +++ b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/BannerWidgetSetup/BannerWidgetPreviewMobile.tsx @@ -87,6 +87,7 @@ export default function BannerWidgetPreviewMobile({ height: "calc(18.57 / 29.5 * 100%)", ml: "calc(7.36 / 196 * 100%)", aspectRatio: 1, + color: buttonTextColor, }} /> - + {appealText || "Пройти тест"} - + {quizHeaderText || "Заголовок теста"} diff --git a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewDesktop.tsx b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewDesktop.tsx index 8e7be42c..4a64e9dd 100644 --- a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewDesktop.tsx +++ b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewDesktop.tsx @@ -56,9 +56,15 @@ export default function ButtonWidgetPreviewDesktop({ width: "auto", height: "calc(18.57 / 29.5 * 100%)", aspectRatio: 1, + color: buttonTextColor, }} /> - + {buttonText || "Пройти тест"} {buttonFlash && } diff --git a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewMobile.tsx b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewMobile.tsx index abb9709a..e70eb7a6 100644 --- a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewMobile.tsx +++ b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetPreviewMobile.tsx @@ -4,9 +4,10 @@ import { Box } from "@mui/material"; interface Props { fixedSide: "left" | "right"; buttonBackgroundColor: string; + buttonTextColor: string; } -export default function ButtonWidgetPreviewMobile({ buttonBackgroundColor, fixedSide }: Props) { +export default function ButtonWidgetPreviewMobile({ buttonBackgroundColor, fixedSide, buttonTextColor }: Props) { return ( diff --git a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetSetup.tsx b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetSetup.tsx index 1c100c34..86103443 100644 --- a/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetSetup.tsx +++ b/src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/ButtonWidgetSetup/ButtonWidgetSetup.tsx @@ -215,7 +215,11 @@ export default function ButtonWidgetSetup({ step, nextButton }: Props) { withShadow={withShadow} /> {!hideOnMobile && ( - + )} @@ -230,7 +234,10 @@ export default function ButtonWidgetSetup({ step, nextButton }: Props) { flex: "1 1 0", }} > - + 1. Задайте размеры окна квиза (опционально) - + 2. Конструктор кнопки Цвет кнопки - setButtonBackgroundColor(color)} /> + setButtonBackgroundColor(color)} + /> Цвет текста кнопки - setButtonTextColor(color)} /> + setButtonTextColor(color)} + /> setHideOnMobile(e.target.checked)} /> - setRounded(e.target.checked)} /> - setWithShadow(e.target.checked)} /> + setRounded(e.target.checked)} + /> + setWithShadow(e.target.checked)} + /> } icon={} />} + control={ + } + icon={} + /> + } label="Слева" sx={{ color: theme.palette.grey2.main, @@ -325,7 +354,12 @@ export default function ButtonWidgetSetup({ step, nextButton }: Props) { /> } icon={} />} + control={ + } + icon={} + /> + } label="Справа" sx={{ color: theme.palette.grey2.main, diff --git a/src/ui_kit/TaskIcon.tsx b/src/ui_kit/TaskIcon.tsx index b95506bc..d95a0ed5 100644 --- a/src/ui_kit/TaskIcon.tsx +++ b/src/ui_kit/TaskIcon.tsx @@ -13,6 +13,7 @@ export default function TaskIcon({ sx = [] }: Props) { alignItems: "center", justifyContent: "center", flexShrink: 0, + color: "white", "& svg": { width: "100%", height: "100%", @@ -21,31 +22,35 @@ export default function TaskIcon({ sx = [] }: Props) { ...(Array.isArray(sx) ? sx : [sx]), ]} > - +