Merge branch 'fix-bag-visual' into dev
This commit is contained in:
commit
0744aeb7c9
@ -74,6 +74,7 @@ export default function InstallQuiz() {
|
|||||||
|
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const isMobile = useMediaQuery(theme.breakpoints.down(600));
|
const isMobile = useMediaQuery(theme.breakpoints.down(600));
|
||||||
|
const isSmallMonitor = useMediaQuery(theme.breakpoints.down(1065));
|
||||||
const CopyLink = () => {
|
const CopyLink = () => {
|
||||||
let one = document.getElementById("inputLinkone").value;
|
let one = document.getElementById("inputLinkone").value;
|
||||||
let text = document.getElementById("inputLink").value;
|
let text = document.getElementById("inputLink").value;
|
||||||
@ -295,9 +296,9 @@ export default function InstallQuiz() {
|
|||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: "flex",
|
display: "flex",
|
||||||
alignItems: isMobile ? "flex-start" : "center",
|
alignItems: isSmallMonitor ? "flex-start" : "center",
|
||||||
gap: "30px",
|
gap: "30px",
|
||||||
flexDirection: isMobile ? "column" : "row",
|
flexDirection: isSmallMonitor ? "column" : "row",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Typography variant="h5" sx={{ paddingRight: "30px" }}>
|
<Typography variant="h5" sx={{ paddingRight: "30px" }}>
|
||||||
|
@ -39,6 +39,7 @@ import TooltipClickInfo from "@ui_kit/Toolbars/TooltipClickInfo";
|
|||||||
export default function BranchingQuestions() {
|
export default function BranchingQuestions() {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const isMobile = useMediaQuery(theme.breakpoints.down(650));
|
const isMobile = useMediaQuery(theme.breakpoints.down(650));
|
||||||
|
const isSmallMobile = useMediaQuery(theme.breakpoints.down(400));
|
||||||
const { openedModalSettingsId } = useUiTools();
|
const { openedModalSettingsId } = useUiTools();
|
||||||
const [targetQuestion, setTargetQuestion] =
|
const [targetQuestion, setTargetQuestion] =
|
||||||
useState<AnyTypedQuizQuestion | null>(
|
useState<AnyTypedQuizQuestion | null>(
|
||||||
@ -119,7 +120,23 @@ export default function BranchingQuestions() {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Box sx={{ color: "#4d4d4d" }}>
|
<Box sx={{ color: "#4d4d4d" }}>
|
||||||
<Typography component="span">{targetQuestion.title}</Typography>
|
<Typography
|
||||||
|
component="span"
|
||||||
|
sx={{
|
||||||
|
overflow: "hidden",
|
||||||
|
textOverflow: "ellipsis",
|
||||||
|
whiteSpace: "nowrap",
|
||||||
|
maxWidth: isSmallMobile
|
||||||
|
? "250px"
|
||||||
|
: isMobile
|
||||||
|
? "350px"
|
||||||
|
: "450px",
|
||||||
|
display: "inline-block",
|
||||||
|
width: "100%",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{targetQuestion.title}
|
||||||
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
{isMobile ? (
|
{isMobile ? (
|
||||||
<TooltipClickInfo
|
<TooltipClickInfo
|
||||||
|
@ -128,9 +128,9 @@ export const QuizAnswersPage: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Box>
|
<Box>
|
||||||
<HeaderFull isRequest={true} />
|
<HeaderFull isRequest={true} sx={{ position: "fixed", zIndex: 9 }} />
|
||||||
<SectionWrapper
|
<SectionWrapper
|
||||||
sx={{ padding: isMobile ? "0 16px" : "20px" }}
|
sx={{ padding: isMobile ? "115px 16px" : "115px 20px 20px" }}
|
||||||
maxWidth="lg"
|
maxWidth="lg"
|
||||||
>
|
>
|
||||||
<Typography
|
<Typography
|
||||||
@ -138,8 +138,9 @@ export const QuizAnswersPage: FC = () => {
|
|||||||
fontSize: "36px",
|
fontSize: "36px",
|
||||||
fontWeight: "500",
|
fontWeight: "500",
|
||||||
mb: "50px",
|
mb: "50px",
|
||||||
mt: "60px",
|
|
||||||
lineHeight: "normal",
|
lineHeight: "normal",
|
||||||
|
wordBreak: "break-word",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{quiz.name}
|
{quiz.name}
|
||||||
|
@ -5,6 +5,8 @@ import {
|
|||||||
Typography,
|
Typography,
|
||||||
useTheme,
|
useTheme,
|
||||||
useMediaQuery,
|
useMediaQuery,
|
||||||
|
SxProps,
|
||||||
|
Theme,
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import NavMenuItem from "./NavMenuItem";
|
import NavMenuItem from "./NavMenuItem";
|
||||||
import Logotip from "../../pages/Landing/images/icons/QuizLogo";
|
import Logotip from "../../pages/Landing/images/icons/QuizLogo";
|
||||||
@ -21,7 +23,12 @@ import { ToTariffsButton } from "@ui_kit/Toolbars/ToTariffsButton";
|
|||||||
import ArrowLeft from "@icons/questionsPage/arrowLeft";
|
import ArrowLeft from "@icons/questionsPage/arrowLeft";
|
||||||
import { cleanAuthTicketData } from "@root/ticket";
|
import { cleanAuthTicketData } from "@root/ticket";
|
||||||
|
|
||||||
export default function HeaderFull({ isRequest }: boolean) {
|
interface Props {
|
||||||
|
isRequest: boolean;
|
||||||
|
sx?: SxProps<Theme>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function HeaderFull({ isRequest, sx }: Props) {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const isTablet = useMediaQuery(theme.breakpoints.down(1000));
|
const isTablet = useMediaQuery(theme.breakpoints.down(1000));
|
||||||
@ -55,6 +62,7 @@ export default function HeaderFull({ isRequest }: boolean) {
|
|||||||
justifyContent: isMobile ? "space-between" : "center",
|
justifyContent: isMobile ? "space-between" : "center",
|
||||||
bgcolor: "white",
|
bgcolor: "white",
|
||||||
borderBottom: "1px solid #E3E3E3",
|
borderBottom: "1px solid #E3E3E3",
|
||||||
|
...sx,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Link to="/">
|
<Link to="/">
|
||||||
|
@ -81,7 +81,7 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) {
|
|||||||
color: theme.palette.grey2.main,
|
color: theme.palette.grey2.main,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Создание quiz
|
{`Создание ${quiz.config.type}`}
|
||||||
</Typography>
|
</Typography>
|
||||||
)}
|
)}
|
||||||
{!disableCollapse && (
|
{!disableCollapse && (
|
||||||
@ -145,7 +145,7 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) {
|
|||||||
color: theme.palette.grey2.main,
|
color: theme.palette.grey2.main,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Настройки quiz
|
{`Настройки ${quiz.config.type}`}
|
||||||
</Typography>
|
</Typography>
|
||||||
)}
|
)}
|
||||||
<List disablePadding>
|
<List disablePadding>
|
||||||
|
@ -148,7 +148,7 @@ export const SidebarMobile: FC<Iprops> = ({
|
|||||||
sx={{
|
sx={{
|
||||||
ml: "15px",
|
ml: "15px",
|
||||||
display: "flex",
|
display: "flex",
|
||||||
alignItems: "end",
|
alignItems: "center",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
justifyContent: "space-between",
|
justifyContent: "space-between",
|
||||||
}}
|
}}
|
||||||
@ -174,7 +174,7 @@ export const SidebarMobile: FC<Iprops> = ({
|
|||||||
id="project-name"
|
id="project-name"
|
||||||
placeholder="Название проекта"
|
placeholder="Название проекта"
|
||||||
sx={{
|
sx={{
|
||||||
width: "270px",
|
width: "85%",
|
||||||
"& .MuiInputBase-root": {
|
"& .MuiInputBase-root": {
|
||||||
height: "34px",
|
height: "34px",
|
||||||
borderRadius: "8px",
|
borderRadius: "8px",
|
||||||
@ -202,7 +202,7 @@ export const SidebarMobile: FC<Iprops> = ({
|
|||||||
</Typography>
|
</Typography>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton onClick={() => setInputOpen(true)}>
|
<IconButton onClick={() => setInputOpen(true)} sx={{ mt: "10px" }}>
|
||||||
<Pencil
|
<Pencil
|
||||||
style={{
|
style={{
|
||||||
position: "absolute",
|
position: "absolute",
|
||||||
|
Loading…
Reference in New Issue
Block a user