diff --git a/lib/assets/icons/ContactFormIcon/EmailIcon.tsx b/lib/assets/icons/ContactFormIcon/EmailIcon.tsx index 4e75e1a..6b603eb 100644 --- a/lib/assets/icons/ContactFormIcon/EmailIcon.tsx +++ b/lib/assets/icons/ContactFormIcon/EmailIcon.tsx @@ -21,26 +21,11 @@ export default function EmailIcon({ color, backgroundColor }: Props) { borderTopLeftRadius: "12px", }} > - - - - + + + + + ); } diff --git a/lib/assets/icons/ContactFormIcon/NameIcon.tsx b/lib/assets/icons/ContactFormIcon/NameIcon.tsx index 5c23f04..5b74d14 100644 --- a/lib/assets/icons/ContactFormIcon/NameIcon.tsx +++ b/lib/assets/icons/ContactFormIcon/NameIcon.tsx @@ -21,31 +21,10 @@ export default function NameIcon({ color, backgroundColor }: Props) { borderTopLeftRadius: "12px", }} > - - - - - + + + + ); } diff --git a/lib/assets/icons/ContactFormIcon/PhoneIcon.tsx b/lib/assets/icons/ContactFormIcon/PhoneIcon.tsx index e62fdbf..07a4df8 100644 --- a/lib/assets/icons/ContactFormIcon/PhoneIcon.tsx +++ b/lib/assets/icons/ContactFormIcon/PhoneIcon.tsx @@ -21,20 +21,9 @@ export default function PhoneIcon({ color, backgroundColor }: Props) { borderTopLeftRadius: "12px", }} > - - - + + + ); } diff --git a/lib/assets/icons/questionsPage/FlagIcon.tsx b/lib/assets/icons/questionsPage/FlagIcon.tsx index b758566..9eebf28 100644 --- a/lib/assets/icons/questionsPage/FlagIcon.tsx +++ b/lib/assets/icons/questionsPage/FlagIcon.tsx @@ -2,22 +2,23 @@ import { Box } from "@mui/material"; interface Props { color: string; + width?: number; } -export default function FlagIcon({ color }: Props) { +export default function FlagIcon({ color, width = 30 }: Props) { return ( { const fireOnce = useRef(true); const [fire, setFire] = useState(false); const isMobile = useRootContainerSize() < 850; + const isTablet = useRootContainerSize() < 1000; const resultQuestion = currentQuestion.type === "result" ? currentQuestion @@ -191,7 +192,8 @@ export const ContactForm = ({currentQuestion, onShowResult}: Props) => { flexDirection: "column", alignItems: "center", justifyContent: "center", - borderRight: isWide && !isMobile ? "1px solid gray" : undefined, + borderRight: isWide && !isMobile ? "1px solid #9A9AAF80" : undefined, + margin: isMobile ? 0 : "40px 0" }} > { > { justifyContent: "center", flexDirection: "column", backgroundColor: theme.palette.background.default, - p: "0px 20px 30px 20px", + p: isMobile ? "40px" : "125px 60px 30px 60px", }} > { sx={{ display: "flex", mt: "20px", - width: isMobile ? "300px" : "450px", + width: isMobile ? "300px" : "390px", }} > { sx={{ display: "flex", alignItems: "center", - mt: "20px", + mt: "55px", + mb: "50px", gap: "15px", textDecoration: "none", }} @@ -368,7 +373,7 @@ const Inputs = ({ const FC = settings.cfg.formContact.fields; if (!FC) return null; - + console.log(email) const Name = ( setName(target.value)} @@ -380,7 +385,7 @@ const Inputs = ({ ); const Email = ( setEmail(target.value)} + onChange={({target}) => setEmail(target.value.replaceAll(/\s/g, ''))} id={email} title={FC["email"].innerText || "Введите Email"} desc={FC["email"].text || "Email"} @@ -447,7 +452,7 @@ const CustomInput = ({title, desc, Icon, onChange, id}: { const isMobile = useRootContainerSize() < 600; const {settings} = useQuizData(); return ( - + {title} @@ -455,7 +460,7 @@ const CustomInput = ({title, desc, Icon, onChange, id}: { { sx={{ position: "relative", padding: "15px 0", - borderTop: `1px solid ${theme.palette.grey[400]}`, + borderTop: `1px solid #9A9AAF80`, height: "75px", display: "flex", background: settings.cfg.design diff --git a/lib/components/ViewPublicationPage/Question.tsx b/lib/components/ViewPublicationPage/Question.tsx index 198b192..57c46f6 100644 --- a/lib/components/ViewPublicationPage/Question.tsx +++ b/lib/components/ViewPublicationPage/Question.tsx @@ -92,40 +92,49 @@ export const Question = ({ ? "transparent" : "linear-gradient(90deg,#272626, transparent)" : theme.palette.background.default, + overflow: "hidden" }} > - - {show_badge && ( - - {quizThemes[settings.cfg.theme].isLight ? ( - - ) : ( - - )} - - )} + + + {show_badge && ( + + {quizThemes[settings.cfg.theme].isLight ? ( + + ) : ( + + )} + + )} +
{ sx={{ width: "100%", maxWidth: "844px", - height: spec ? "auto" : isMobile ? "100%" : "306px", - borderRadius: "8px" + height: spec ? "auto" : isMobile ? "236px" : "306px", + borderRadius: "8px", + objectFit: "contain", }} - >
 + /> ) } {resultQuestion.description !== "" && @@ -196,7 +197,7 @@ export const ResultForm = ({resultQuestion}: ResultFormProps) => { mt: "15px", gap: "10px", textDecoration: "none", - mb: "5px" + mb: "15px" }} > - {isMobileMini ? "←" : "← Назад"} - - } - nextButton={ - - } + prevButton={ } + nextButton={} /> ); break; diff --git a/lib/components/ViewPublicationPage/questions/Date.tsx b/lib/components/ViewPublicationPage/questions/Date.tsx index b7a2438..7a392b2 100644 --- a/lib/components/ViewPublicationPage/questions/Date.tsx +++ b/lib/components/ViewPublicationPage/questions/Date.tsx @@ -96,7 +96,7 @@ export const Date = ({ currentQuestion }: DateProps) => { : theme.palette.background.default, borderRadius: "10px", maxWidth: "250px", - pr: "22px", + pr: "30px", "& input": { py: "11px", pl: "20px", diff --git a/lib/components/ViewPublicationPage/questions/Emoji.tsx b/lib/components/ViewPublicationPage/questions/Emoji.tsx index d7412f3..d573269 100644 --- a/lib/components/ViewPublicationPage/questions/Emoji.tsx +++ b/lib/components/ViewPublicationPage/questions/Emoji.tsx @@ -70,7 +70,7 @@ export const Emoji = ({ currentQuestion }: EmojiProps) => { > {currentQuestion.content.variants.map((variant, index) => ( { maxWidth: "317px", width: "100%", height: "255px", - background: settings.cfg.design - ? quizThemes[settings.cfg.theme].isLight - ? "#F2F3F7" - : "rgba(154,154,175, 0.2)" - : "transparent", + background: settings.cfg.design && !quizThemes[settings.cfg.theme].isLight + ? "rgba(255,255,255, 0.3)" : settings.cfg.design && quizThemes[settings.cfg.theme].isLight || quizThemes[settings.cfg.theme].isLight + ? "#FFFFFF" + : "transparent", + "&:hover": {borderColor: theme.palette.primary.main}, + }} + // value={index} + onClick={async (event) => { + event.preventDefault(); + if (isSending) return; + + setIsSending(true); + try { + await sendAnswer({ + questionId: currentQuestion.id, + body: + currentQuestion.content.variants[index].extendedText + + " " + + currentQuestion.content.variants[index].answer, + qid: quizId, + }); + + updateAnswer( + currentQuestion.id, + currentQuestion.content.variants[index].id, + currentQuestion.content.variants[index].points || 0 + ); + } catch (e) { + enqueueSnackbar("ответ не был засчитан"); + } + + if (answer === currentQuestion.content.variants[index].id) { + deleteAnswer(currentQuestion.id); + try { + await sendAnswer({ + questionId: currentQuestion.id, + body: "", + qid: quizId, + }); + } catch (e) { + enqueueSnackbar("ответ не был засчитан"); + } + } + + setIsSending(false); }} > { alignItems: "center", height: "193px", background: "#ffffff", + cursor: "pointer" }} > { } }} value={index} - onClick={async (event) => { - event.preventDefault(); - if (isSending) return; - - setIsSending(true); - try { - await sendAnswer({ - questionId: currentQuestion.id, - body: - currentQuestion.content.variants[index].extendedText + - " " + - currentQuestion.content.variants[index].answer, - qid: quizId, - }); - - updateAnswer( - currentQuestion.id, - currentQuestion.content.variants[index].id, - currentQuestion.content.variants[index].points || 0 - ); - } catch (e) { - enqueueSnackbar("ответ не был засчитан"); - } - - if (answer === currentQuestion.content.variants[index].id) { - deleteAnswer(currentQuestion.id); - try { - await sendAnswer({ - questionId: currentQuestion.id, - body: "", - qid: quizId, - }); - } catch (e) { - enqueueSnackbar("ответ не был засчитан"); - } - } - - setIsSending(false); - }} control={ } icon={} + sx={{ + position: "absolute", + top: "-162px", + right: "12px", + }} /> } label={ diff --git a/lib/components/ViewPublicationPage/questions/Images.tsx b/lib/components/ViewPublicationPage/questions/Images.tsx index 8ed605c..f17f122 100644 --- a/lib/components/ViewPublicationPage/questions/Images.tsx +++ b/lib/components/ViewPublicationPage/questions/Images.tsx @@ -74,16 +74,16 @@ export const Images = ({ currentQuestion }: ImagesProps) => { key={index} sx={{ cursor: "pointer", - borderRadius: "5px", + borderRadius: "12px", border: `1px solid`, borderColor: answer === variant.id ? theme.palette.primary.main : "#9A9AAF", - background: settings.cfg.design - ? quizThemes[settings.cfg.theme].isLight + "&:hover": {borderColor: theme.palette.primary.main}, + background: settings.cfg.design && !quizThemes[settings.cfg.theme].isLight + ? "rgba(255,255,255, 0.3)" : settings.cfg.design && quizThemes[settings.cfg.theme].isLight || quizThemes[settings.cfg.theme].isLight ? "#FFFFFF" - : "rgba(154,154,175, 0.2)" : "transparent", }} onClick={async (event) => { @@ -133,6 +133,7 @@ export const Images = ({ currentQuestion }: ImagesProps) => { width: "100%", height: "100%", objectFit: "cover", + borderRadius: "12px 12px 0 0" }} /> )} @@ -149,6 +150,7 @@ export const Images = ({ currentQuestion }: ImagesProps) => { display: "flex", alignItems: variant.answer.length <= 60 ? "center" : "flex-start", + justifyContent: "center", position: "relative", height: "80px", "& .MuiFormControlLabel-label": { @@ -156,7 +158,6 @@ export const Images = ({ currentQuestion }: ImagesProps) => { height: variant.answer.length <= 60 ? undefined : "60px", overflow: "auto", lineHeight: "normal", - paddingLeft: "45px", "&::-webkit-scrollbar": { width: "4px", }, @@ -172,6 +173,11 @@ export const Images = ({ currentQuestion }: ImagesProps) => { } icon={} + sx={{ + position: "absolute", + top: "-297px", + right: 0 + }} /> } label={variant.answer} diff --git a/lib/components/ViewPublicationPage/questions/Number.tsx b/lib/components/ViewPublicationPage/questions/Number.tsx index f942d06..f7e323c 100644 --- a/lib/components/ViewPublicationPage/questions/Number.tsx +++ b/lib/components/ViewPublicationPage/questions/Number.tsx @@ -375,7 +375,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { width: "100%", marginTop: "20px", gap: "30px", - paddingRight: isMobile ? "10px" : undefined, + padding: "0 30px", }} > { color: theme.palette.primary.main, "& .MuiSlider-valueLabel": { background: theme.palette.primary.main, + borderRadius: "8px", + minWidth: "60px", + height: "36px" }, }} /> diff --git a/lib/components/ViewPublicationPage/questions/Rating.tsx b/lib/components/ViewPublicationPage/questions/Rating.tsx index ddf1fcf..c6ae697 100644 --- a/lib/components/ViewPublicationPage/questions/Rating.tsx +++ b/lib/components/ViewPublicationPage/questions/Rating.tsx @@ -29,31 +29,31 @@ type RatingProps = { const buttonRatingForm = [ { name: "star", - icon: (color: string) => , + icon: (color: string, width: number) => , }, { name: "trophie", - icon: (color: string) => , + icon: (color: string, width: number) => , }, { name: "flag", - icon: (color: string) => , + icon: (color: string, width: number) => , }, { name: "heart", - icon: (color: string) => , + icon: (color: string, width: number) => , }, { name: "like", - icon: (color: string) => , + icon: (color: string, width: number) => , }, { name: "bubble", - icon: (color: string) => , + icon: (color: string, width: number) => , }, { name: "hashtag", - icon: (color: string) => , + icon: (color: string, width: number) => , }, ]; @@ -62,6 +62,7 @@ export const Rating = ({ currentQuestion }: RatingProps) => { const { answers } = useQuizViewStore(); const theme = useTheme(); const isMobile = useRootContainerSize() < 650; + const isTablet = useRootContainerSize() < 750; const [isSending, setIsSending] = useState(false); const { answer } = answers.find( @@ -118,8 +119,8 @@ export const Rating = ({ currentQuestion }: RatingProps) => { "& .MuiRating-root.Mui-disabled": {opacity: "1!important"} }} max={currentQuestion.content.steps} - icon={form?.icon(theme.palette.primary.main)} - emptyIcon={form?.icon("#9A9AAF")} + icon={form?.icon(theme.palette.primary.main, isMobile ? 30 : isTablet ? 40 : 50)} + emptyIcon={form?.icon("#9A9AAF", isMobile ? 30 : isTablet ? 40 : 50)} /> { background: settings.cfg.design ? quizThemes[settings.cfg.theme].isLight ? "#F2F3F7" - : "rgba(154,154,175, 0.2)" + : "rgba(255,255,255, 0.3)" : "transparent", }, }} diff --git a/lib/components/ViewPublicationPage/questions/Text.tsx b/lib/components/ViewPublicationPage/questions/Text.tsx index 6351836..0dda3ba 100644 --- a/lib/components/ViewPublicationPage/questions/Text.tsx +++ b/lib/components/ViewPublicationPage/questions/Text.tsx @@ -155,7 +155,7 @@ const TextNormal = ({ currentQuestion, answer, inputHC }: Props) => { background: settings.cfg.design ? quizThemes[settings.cfg.theme].isLight ? "#F2F3F7" - : "rgba(154,154,175, 0.2)" + : "rgba(255,255,255, 0.3)" : "transparent", }, "& .MuiOutlinedInput-notchedOutline": { diff --git a/lib/components/ViewPublicationPage/questions/Variant.tsx b/lib/components/ViewPublicationPage/questions/Variant.tsx index 0a81a2e..6108f2b 100644 --- a/lib/components/ViewPublicationPage/questions/Variant.tsx +++ b/lib/components/ViewPublicationPage/questions/Variant.tsx @@ -178,7 +178,7 @@ const VariantItem = ({ backgroundColor: settings.cfg.design ? quizThemes[settings.cfg.theme].isLight ? "#FFFFFF" - : "rgba(154,154,175, 0.2)" + : "rgba(255,255,255, 0.3)" : quizThemes[settings.cfg.theme].isLight ? "white" : theme.palette.background.default, @@ -187,6 +187,7 @@ const VariantItem = ({ maxHeight: "85px", justifyContent: "space-between", width: "100%", + "&:hover": {borderColor: theme.palette.primary.main}, "&.MuiFormControl-root": { width: "100%", }, diff --git a/lib/components/ViewPublicationPage/questions/Varimg.tsx b/lib/components/ViewPublicationPage/questions/Varimg.tsx index 9816ab6..99e2c65 100644 --- a/lib/components/ViewPublicationPage/questions/Varimg.tsx +++ b/lib/components/ViewPublicationPage/questions/Varimg.tsx @@ -51,7 +51,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { display: "flex", marginTop: "20px", flexDirection: isMobile ? "column-reverse" : undefined, - gap: isMobile ? "30px" : undefined, + gap: "30px", alignItems: isMobile ? "center" : undefined, }} > @@ -67,8 +67,6 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { justifyContent: "space-between", flexBasis: "100%", width: isMobile ? "100%" : undefined, - - //"&:focus": {color: theme.palette.text.primary } }} > { display: "flex", flexDirection: "column", width: "100%", - gap: isMobile ? "20px" : undefined, + gap: "20px", "&:focus": {color: theme.palette.text.primary }, "&:active": {color: theme.palette.text.primary } }} @@ -87,13 +85,13 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { disabled={isSending} sx={{ marginBottom: "15px", - borderRadius: "5px", - padding: "15px", + borderRadius: "12px", + padding: "20px", color: theme.palette.text.primary, backgroundColor: settings.cfg.design ? quizThemes[settings.cfg.theme].isLight ? "#FFFFFF" - : "rgba(154,154,175, 0.2)" + : "rgba(255,255,255, 0.3)" : quizThemes[settings.cfg.theme].isLight ? "white" : theme.palette.background.default, @@ -103,13 +101,13 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { ? theme.palette.primary.main : "#9A9AAF", display: "flex", - margin: isMobile ? 0 : undefined, + margin: 0, + "&:hover": {borderColor: theme.palette.primary.main}, "& .MuiFormControlLabel-label": { wordBreak: "break-word", height: variant.answer.length <= 60 ? undefined : "60px", overflow: "auto", lineHeight: "normal", - paddingLeft: "45px", "&::-webkit-scrollbar": { width: "4px", }, @@ -121,6 +119,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { color: theme.palette.text.primary, } }} + labelPlacement="start" value={index} onClick={async (event) => { event.preventDefault(); @@ -182,7 +181,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { display: "flex", alignItems: "center", justifyContent: "center", - backgroundColor: "#9A9AAF12", + backgroundColor: "#9A9AAF30", color: theme.palette.text.primary, textAlign: "center", }} diff --git a/lib/components/ViewPublicationPage/tools/NextButton.tsx b/lib/components/ViewPublicationPage/tools/NextButton.tsx new file mode 100644 index 0000000..b5b310c --- /dev/null +++ b/lib/components/ViewPublicationPage/tools/NextButton.tsx @@ -0,0 +1,28 @@ +import {Button, useTheme} from "@mui/material"; +import { quizThemes } from "@utils/themes/Publication/themePublication"; +import { useQuizData } from "@contexts/QuizDataContext"; + +interface Props{ + isNextButtonEnabled: boolean, + moveToNextQuestion: () => void, +} + +export default function NextButton ({isNextButtonEnabled, moveToNextQuestion}: Props) { + const theme = useTheme(); + const { settings } = useQuizData(); + return( + + )} diff --git a/lib/components/ViewPublicationPage/tools/PrevButton.tsx b/lib/components/ViewPublicationPage/tools/PrevButton.tsx new file mode 100644 index 0000000..5cfb403 --- /dev/null +++ b/lib/components/ViewPublicationPage/tools/PrevButton.tsx @@ -0,0 +1,38 @@ +import {Button, useTheme} from "@mui/material"; +import {useRootContainerSize} from "../../../contexts/RootContainerWidthContext"; +import { quizThemes } from "@utils/themes/Publication/themePublication"; +import { useQuizData } from "@contexts/QuizDataContext"; + +interface Props{ + isPreviousButtonEnabled: boolean, + moveToPrevQuestion: () => void, +} + +export default function PrevButton ({isPreviousButtonEnabled, moveToPrevQuestion}: Props) { + const theme = useTheme(); + const { settings } = useQuizData(); + const isMobileMini = useRootContainerSize() < 382; + return( + + ) +} \ No newline at end of file diff --git a/lib/components/ViewPublicationPage/tools/Select.tsx b/lib/components/ViewPublicationPage/tools/Select.tsx index 33574a8..d12195b 100644 --- a/lib/components/ViewPublicationPage/tools/Select.tsx +++ b/lib/components/ViewPublicationPage/tools/Select.tsx @@ -85,7 +85,6 @@ export const Select = ({ borderRadius: "8px", "& .MuiOutlinedInput-notchedOutline": { border: `1px solid ${colorMain} !important`, - height: "48px", borderRadius: "10px", }, "& .MuiSelect-icon": { diff --git a/lib/utils/themes/Publication/genericPublication.ts b/lib/utils/themes/Publication/genericPublication.ts index f6f319e..1c64af7 100644 --- a/lib/utils/themes/Publication/genericPublication.ts +++ b/lib/utils/themes/Publication/genericPublication.ts @@ -14,9 +14,14 @@ const themePublic = createTheme({ padding: '13px 20px', borderRadius: '8px', boxShadow: "none", - // "&:hover": { - // backgroundColor: "#581CA7" - // } + "&:active": { + backgroundColor: "#000000", + color: "#FFFFFF" + }, + "&:disabled": { + color: "#9A9AAF", + border: "1px solid #9A9AAF", + }, }, }, diff --git a/lib/utils/themes/Publication/themePublication.ts b/lib/utils/themes/Publication/themePublication.ts index 0080ffa..f60610a 100644 --- a/lib/utils/themes/Publication/themePublication.ts +++ b/lib/utils/themes/Publication/themePublication.ts @@ -9,6 +9,7 @@ const StandardTheme = createTheme({ palette: { primary: { main: "#7E2AEA", + dark: "#581CA7", }, secondary: { main: "#252734", @@ -29,6 +30,7 @@ const StandardDarkTheme = createTheme({ palette: { primary: { main: "#7E2AEA", + dark: "#581CA7", }, secondary: { main: "#252734", @@ -49,6 +51,7 @@ const PinkTheme = createTheme({ palette: { primary: { main: "#D34085", + dark: "#AD376E", }, secondary: { main: "#252734", @@ -69,6 +72,7 @@ const PinkDarkTheme = createTheme({ palette: { primary: { main: "#D34085", + dark: "#AD376E", }, secondary: { main: "#252734", @@ -89,6 +93,7 @@ const BlackWhiteTheme = createTheme({ palette: { primary: { main: "#4E4D51", + dark: "#323232", }, secondary: { main: "#252734", @@ -109,6 +114,7 @@ const OliveTheme = createTheme({ palette: { primary: { main: "#758E4F", + dark: "#4A6324", }, secondary: { main: "#252734", @@ -129,6 +135,7 @@ const PurpleTheme = createTheme({ palette: { primary: { main: "#7E2AEA", + dark: "#581CA7", }, secondary: { main: "#252734", @@ -149,6 +156,7 @@ const YellowTheme = createTheme({ palette: { primary: { main: "#F2B133", + dark: "#E6A11C", }, secondary: { main: "#252734", @@ -169,6 +177,7 @@ const GoldDarkTheme = createTheme({ palette: { primary: { main: "#E6AA37", + dark: "#E19A13", }, secondary: { main: "#FFFCF6", @@ -189,6 +198,7 @@ const BlueTheme = createTheme({ palette: { primary: { main: "#4964ED", + dark: "#354DC8", }, secondary: { main: "#252734", @@ -209,6 +219,7 @@ const BlueDarkTheme = createTheme({ palette: { primary: { main: "#07A0C3", + dark: "#0A819C", }, secondary: { main: "#252734", @@ -229,6 +240,7 @@ const Design1 = createTheme({ palette: { primary: { main: "#F2B133", + dark: "#E6A11C", }, secondary: { main: "#252734", @@ -249,6 +261,7 @@ const Design2 = createTheme({ palette: { primary: { main: "#3D9A63", + dark: "#247746", }, secondary: { main: "#252734", @@ -269,6 +282,7 @@ const Design3 = createTheme({ palette: { primary: { main: "#4B6A99", + dark: "#32507D", }, secondary: { main: "#252734", @@ -289,6 +303,7 @@ const Design4 = createTheme({ palette: { primary: { main: "#FF9431", + dark: "#EF8624", }, secondary: { main: "#252734", @@ -309,6 +324,7 @@ const Design5 = createTheme({ palette: { primary: { main: "#2D99BA", + dark: "#1A84A6", }, secondary: { main: "#252734", @@ -329,6 +345,7 @@ const Design6 = createTheme({ palette: { primary: { main: "#D34085", + dark: "#AD376E", }, secondary: { main: "#252734", @@ -349,6 +366,7 @@ const Design7 = createTheme({ palette: { primary: { main: "#B47C3B", + dark: "#9C6524", }, secondary: { main: "#252734", @@ -369,6 +387,7 @@ const Design8 = createTheme({ palette: { primary: { main: "#F0B136", + dark: "#E19F1D", }, secondary: { main: "#252734", @@ -389,6 +408,7 @@ const Design9 = createTheme({ palette: { primary: { main: "#678F48", + dark: "#527933", }, secondary: { main: "#252734", @@ -409,6 +429,7 @@ const Design10 = createTheme({ palette: { primary: { main: "#3666AF", + dark: "#1B478A", }, secondary: { main: "#252734", diff --git a/lib/utils/themes/generic.ts b/lib/utils/themes/generic.ts index e658b98..d100b21 100644 --- a/lib/utils/themes/generic.ts +++ b/lib/utils/themes/generic.ts @@ -65,7 +65,7 @@ const theme = createTheme({ h5: { // H2 в макете fontSize: "24px", lineHeight: "28.44px", - fontWeight: 500, + fontWeight: 501, }, button: { fontSize: "18px",