From 25fb2034337055a4e49acedd5980b10bc95e5cea Mon Sep 17 00:00:00 2001 From: yyypearl Date: Thu, 31 Oct 2024 20:45:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=92=84=20design(#72):=20=ED=96=89?= =?UTF-8?q?=EC=84=B1=20=EC=9D=B4=EB=AF=B8=EC=A7=80,=20=ED=8E=B8=EC=A7=91?= =?UTF-8?q?=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=84=A0=ED=83=9D=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/planet/add/page.tsx | 17 ++++++++++++++++- src/components/common/Planet.tsx | 11 ++++++++++- src/components/common/Tag.tsx | 11 ++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/app/planet/add/page.tsx b/src/app/planet/add/page.tsx index 3a991aed..fb4e8219 100644 --- a/src/app/planet/add/page.tsx +++ b/src/app/planet/add/page.tsx @@ -53,7 +53,7 @@ const PlanetAddPage = () => { - { setConfirmDeleteModal(false); }; + // 컴포넌트에서 이미지 컨텍스트 메뉴 방지 + const handleContextMenu = (e: React.MouseEvent) => { + e.preventDefault(); + }; + return ( { height={400} alt="planet" priority + onContextMenu={handleContextMenu} /> {/* */} {orbits && @@ -209,7 +215,9 @@ const PlanetImage = styled(Image)` left: 50%; transform: translate(-50%, -50%); z-index: 5; - //드래그방지 + + touch-action: none; + pointer-events: none; -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; @@ -219,6 +227,7 @@ const PlanetImage = styled(Image)` -khtml-user-drag: none; -moz-user-drag: none; -o-user-drag: none; + -webkit-touch-callout: none; `; const Shadow = styled.div` diff --git a/src/components/common/Tag.tsx b/src/components/common/Tag.tsx index 1ae64b07..f9cc26aa 100644 --- a/src/components/common/Tag.tsx +++ b/src/components/common/Tag.tsx @@ -337,7 +337,7 @@ const Tag = (props: TagProps) => { /> )} {tagType === "planet" && ( - Date: Thu, 31 Oct 2024 21:09:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=84=20design(#72):=20safari=20inpu?= =?UTF-8?q?t=20=ED=99=95=EB=8C=80=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20=EC=9C=84=ED=95=B4=2016px=20=EC=9D=B4=EC=83=81?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Input.tsx | 10 +++++----- src/styles/GlobalStyles.ts | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/common/Input.tsx b/src/components/common/Input.tsx index b5238a88..549b727d 100644 --- a/src/components/common/Input.tsx +++ b/src/components/common/Input.tsx @@ -129,11 +129,12 @@ const sharedStyles = ` border-radius: 8px; background: ${theme.colors.gray800}; color: ${theme.colors.white}; - ${(props: any) => props.theme.fonts.body08}; + ${(props: any) => props.theme.fonts.body07}; + font-family: "Pretendard"; &::placeholder { color: ${theme.colors.gray500}; - ${(props: any) => props.theme.fonts.body09}; + ${(props: any) => props.theme.fonts.body07}; } &:disabled { @@ -173,11 +174,10 @@ const StyledTextarea = styled.textarea<{ }>` ${sharedStyles} height: ${({ $height }) => $height}; - font-family: "Pretendard"; - ${(props: any) => props.theme.fonts.medium14}; + ${(props: any) => props.theme.fonts.body07}; &::placeholder { - ${(props: any) => props.theme.fonts.regular14}; + ${(props: any) => props.theme.fonts.body07}; letter-spacing: 1px; } diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index fdc8d5b2..a389fe2c 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -68,6 +68,8 @@ input, textarea { border: none; outline: none; resize: none; + + font-size: 16px; } @font-face {