Merge branch 'dev' into 'staging'

коммент неиспользуемых настроек

See merge request frontend/squiz!351
This commit is contained in:
Nastya 2024-07-07 17:13:04 +00:00
commit 5edad99ff6
4 changed files with 12 additions and 12 deletions

@ -29,7 +29,7 @@ const SettingEmoji = memo<SettingEmojiProps>(function ({ questionId, isRequired,
pt: isTablet ? "5px" : "0px",
}}
>
<Box
{/* <Box
sx={{
boxSizing: "border-box",
pt: "20px",
@ -72,7 +72,7 @@ const SettingEmoji = memo<SettingEmojiProps>(function ({ questionId, isRequired,
});
}}
/>
</Box>
</Box> */}
<Box
sx={{
pt: "20px",

@ -49,7 +49,7 @@ const SettingOptionsAndPict = memo<SettingOptionsAndPictProps>(function ({ quest
width: "100%",
}}
>
<Typography
{/* <Typography
sx={{
height: isMobile ? "18px" : "auto",
fontWeight: "500",
@ -58,8 +58,8 @@ const SettingOptionsAndPict = memo<SettingOptionsAndPictProps>(function ({ quest
}}
>
Настройки ответов
</Typography>
<CustomCheckbox
</Typography> */}
{/* <CustomCheckbox
dataCy="checkbox-own-answer"
sx={{ mr: isMobile ? "0px" : "16px" }}
label={'Вариант "свой ответ"'}
@ -69,7 +69,7 @@ const SettingOptionsAndPict = memo<SettingOptionsAndPictProps>(function ({ quest
question.content.own = target.checked;
});
}}
/>
/> */}
{!isWrappColumn && (
<Box sx={{ mt: isMobile ? "11px" : "6px", width: "100%" }}>
<Typography

@ -68,7 +68,7 @@ const SettingOptionsPict = memo<SettingOpytionsPictProps>(function ({
pt: isTablet ? "5px" : "0px",
}}
>
<Box sx={{ display: "flex", flexDirection: "column", width: "100%" }}>
{/* <Box sx={{ display: "flex", flexDirection: "column", width: "100%" }}>
<Box
sx={{
boxSizing: "border-box",
@ -155,9 +155,9 @@ const SettingOptionsPict = memo<SettingOpytionsPictProps>(function ({
}}
/>
</Box>
</Box>
</Box> */}
<Box sx={{ display: "flex", flexDirection: "column", width: "100%" }}>
<Box
{/* <Box
sx={{
boxSizing: "border-box",
pt: "20px",
@ -198,7 +198,7 @@ const SettingOptionsPict = memo<SettingOpytionsPictProps>(function ({
/>
))}
</Box>
</Box>
</Box> */}
<Box
sx={{
pt: "20px",

@ -30,7 +30,7 @@ const ResponseSettings = memo<Props>(function ({ questionId, isRequired, isLarge
pt: isTablet ? "5px" : "0px",
}}
>
<Box
{/* <Box
sx={{
boxSizing: "border-box",
pt: "20px",
@ -84,7 +84,7 @@ const ResponseSettings = memo<Props>(function ({ questionId, isRequired, isLarge
});
}}
/>
</Box>
</Box> */}
<Box
sx={{
boxSizing: "border-box",