From 71f913e0783d871cfb96fce12287fa052497e601 Mon Sep 17 00:00:00 2001 From: Tamara Date: Mon, 1 Jul 2024 03:35:59 +0300 Subject: [PATCH] =?UTF-8?q?z-index=20=D1=81=D0=B5=D0=BB=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AmoQuestions/CurrentFieldSelectMobile.tsx | 3 --- .../AmoQuestions/EntitiesQuestions.tsx | 14 ++++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/CurrentFieldSelectMobile.tsx b/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/CurrentFieldSelectMobile.tsx index 9cfafc70..c5901120 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/CurrentFieldSelectMobile.tsx +++ b/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/CurrentFieldSelectMobile.tsx @@ -178,9 +178,6 @@ export const CurrentFieldSelect: FC = ({ items, selectedItemI "& .MuiOutlinedInput-notchedOutline": { border: 0, }, - "& .MuiMenu-root.MuiModal-root": { - zIndex: 0, - }, }} onChange={({ target }: SelectChangeEvent) => setSelectedItem(target.value)} onClick={toggleOpened} diff --git a/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/EntitiesQuestions.tsx b/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/EntitiesQuestions.tsx index 6371f94f..9b3ceb61 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/EntitiesQuestions.tsx +++ b/src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/EntitiesQuestions.tsx @@ -1,4 +1,4 @@ -import { Box, Button } from "@mui/material" +import {Box, Button, useMediaQuery, useTheme} from "@mui/material" import { StepButtonsBlock } from "../StepButtonsBlock/StepButtonsBlock" import { FC, useState } from "react"; import { MinifiedData, TagKeys } from "../types"; @@ -36,6 +36,8 @@ export const EntitiesQuestions: FC = ({ setIsCurrentFields, isCurrentFields, }) => { + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down(600)); return ( = ({ onClick={() => setIsCurrentFields(old => !old)} sx={{ borderRadius: "50px", - p: "10px 30px", + p: isMobile ? "8px 20px" : "10px 30px", mr: "10px", - + fontSize: "16px", border: isCurrentFields ? "1px solid #7E2AEA" : "", bgcolor: isCurrentFields ? "#7E2AEA1A" : "#F2F3F7", color: isCurrentFields ? "#7E2AEA" : "", @@ -72,13 +74,13 @@ export const EntitiesQuestions: FC = ({ onClick={() => setIsCurrentFields(old => !old)} sx={{ borderRadius: "50px", - p: "10px 30px", - + p: isMobile ? "8px 20px" : "10px 30px", + fontSize: "16px", border: !isCurrentFields ? "1px solid #7E2AEA" : "", bgcolor: !isCurrentFields ? "#7E2AEA1A" : "#F2F3F7", color: !isCurrentFields ? "#7E2AEA" : "", }} - >Новые поля + >Новые поля { isCurrentFields ?