From 298e462314d3e590e600c3fe45d6b9535e065f13 Mon Sep 17 00:00:00 2001 From: oyeong011 Date: Sun, 13 Oct 2024 20:14:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX/HM-145]=20=ED=88=B4=ED=8C=81=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=9E=AC=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B2=B0=EA=B3=BC=20=EC=85=80=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/select/HeaderToolTip.tsx | 30 +++++-------------- .../meeting/timetable/ResultTimeCell.tsx | 20 ++++++------- src/pages/SelectPage.tsx | 2 +- 3 files changed, 19 insertions(+), 33 deletions(-) diff --git a/src/components/meeting/select/HeaderToolTip.tsx b/src/components/meeting/select/HeaderToolTip.tsx index eb51aa8..24b64d3 100644 --- a/src/components/meeting/select/HeaderToolTip.tsx +++ b/src/components/meeting/select/HeaderToolTip.tsx @@ -30,12 +30,6 @@ const ToolTipWrapper = styled.div` top: 50px; display: flex; justify-content: center; - - @media (max-width: 768px) { - left: auto; // 모바일 화면에서 왼쪽 위치를 자동으로 설정 - right: 5%; // 모바일 화면에서 오른쪽으로 이동 - top: 70px; // 모바일 화면에서 약간 아래로 내려가게 설정 - } `; const CustomTooltip = styled.div` @@ -49,7 +43,7 @@ const CustomTooltip = styled.div` @media (max-width: 768px) { padding: 5px; // 모바일 화면에서 패딩 조정 - width: 90%; // 모바일에서 툴팁의 너비를 조정 + width: 95%; // 모바일에서 툴팁의 너비를 조정 } `; @@ -68,29 +62,26 @@ export const TooltipArrow = styled.div<{ isAbove?: boolean }>` right: 7%; @media (max-width: 768px) { - top: ${({ isAbove }) => - isAbove ? `40px` : `-12px`}; // 모바일 화면에서 화살표 위치 약간 조정 - width: 15px; // 화살표 크기 축소 + top: ${({ isAbove }) => (isAbove ? `30px` : `-7.5px`)}; + } + @media (max-width: 450px) { + width: 15px; height: 15px; + top: ${({ isAbove }) => (isAbove ? `20px` : `-4.5px`)}; } `; const commonStyles = ` font-size: 14px; color: ${theme.color.point.purple}; - - @media (max-width: 768px) { - font-size: 7px; // 모바일 화면에서 글자 크기 축소 + @media (max-width: 450px) { + font-size: 0.6rem; } `; export const UserName = styled.span` ${commonStyles} margin: 5px; - - @media (max-width: 768px) { - font-size: 7px; // 모바일 화면에서 더 작은 글씨 크기 - } `; const CloseButton = styled.button` @@ -99,9 +90,4 @@ const CloseButton = styled.button` border: none; cursor: pointer; padding: 5px; - - @media (max-width: 768px) { - padding: 2px; // 모바일 화면에서 버튼 패딩 축소 - font-size: 7px; // 모바일에서 버튼 글씨 크기도 작게 - } `; diff --git a/src/components/meeting/timetable/ResultTimeCell.tsx b/src/components/meeting/timetable/ResultTimeCell.tsx index d247255..c608c0f 100644 --- a/src/components/meeting/timetable/ResultTimeCell.tsx +++ b/src/components/meeting/timetable/ResultTimeCell.tsx @@ -52,9 +52,9 @@ function ResultTimeCell({ if (!cell) return; if (!dragDisabled) { - cell.addEventListener('touchstart', handleTouchStart, { passive: false }); - cell.addEventListener('touchmove', handleTouchMove, { passive: false }); - cell.addEventListener('touchend', onDragEnd, { passive: false }); + cell.addEventListener('touchstart', handleTouchStart, { passive: true }); + cell.addEventListener('touchmove', handleTouchMove, { passive: true }); + cell.addEventListener('touchend', onDragEnd, { passive: true }); return () => { cell.removeEventListener('touchstart', handleTouchStart); @@ -107,16 +107,16 @@ const ResultHalfCell = styled(SelectHalfCell)< selected && ` background-image: linear-gradient( - -45deg, /* 각도를 -45도로 설정하여 반대 방향으로 */ - ${theme.color.primary.white} 10%, /* 더 얇은 흰색 줄무늬 */ - ${theme.color.point.green} 0, /* 초록색 배경 */ - ${theme.color.point.green} 50%, /* 초록색 부분 */ - ${theme.color.primary.white} 0, /* 다시 얇은 흰색 줄무늬 */ + -45deg, + ${theme.color.primary.white} 10%, + ${theme.color.point.green} 0, + ${theme.color.point.green} 50%, + ${theme.color.primary.white} 0, ${theme.color.primary.white} 60%, ${theme.color.point.green} 0 ); - background-size: 10px 10px; /* 패턴 크기 */ - background-color: ${theme.color.point.green}; /* 초록색 배경 */ + background-size: 10px 10px; + background-color: ${theme.color.point.green}; `}; &:first-child { diff --git a/src/pages/SelectPage.tsx b/src/pages/SelectPage.tsx index 2fcd7d4..84df110 100644 --- a/src/pages/SelectPage.tsx +++ b/src/pages/SelectPage.tsx @@ -26,7 +26,7 @@ import useTimeTableData from '@/hooks/useTimeTableData'; import { useRedirect } from '@/hooks/useRedirect'; function SelectPage() { - useRedirect(); + // useRedirect(); const navigate = useNavigate(); const { selectedTimes } = useTimeStore(); const { closeModal, isOpen, openModal } = useModal(); From e58e970cdbfbc5557beceb68141ae9776693fb4a Mon Sep 17 00:00:00 2001 From: oyeong011 Date: Sun, 13 Oct 2024 20:15:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX/HM-145]=20=EB=A6=AC=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EB=A0=89=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SelectPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/SelectPage.tsx b/src/pages/SelectPage.tsx index 84df110..2fcd7d4 100644 --- a/src/pages/SelectPage.tsx +++ b/src/pages/SelectPage.tsx @@ -26,7 +26,7 @@ import useTimeTableData from '@/hooks/useTimeTableData'; import { useRedirect } from '@/hooks/useRedirect'; function SelectPage() { - // useRedirect(); + useRedirect(); const navigate = useNavigate(); const { selectedTimes } = useTimeStore(); const { closeModal, isOpen, openModal } = useModal();