diff --git a/src/App.tsx b/src/App.tsx index 96beb78e..b9a3aee2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,7 +14,6 @@ import AccountCancel from './pages/AccountCancel'; import Verification from './pages/verification'; import Post from './pages/Post'; -import MyPost from './pages/MyPost'; import PostUpload from './pages/PostUpload'; import PostImageSelect from './pages/PostImageSelect'; import PostInstaConnect from './pages/PostInstaConnect'; @@ -43,7 +42,6 @@ const protectedRoutes = [ { path: '/verification', element: }, { path: '/post/:postId', element: }, - { path: '/my-post/:postId', element: }, { path: '/upload', element: }, { path: '/image-select', element: }, { path: '/insta-connect', element: }, diff --git a/src/assets/default/delete.svg b/src/assets/default/delete.svg index d610e95f..5f1e9b45 100644 --- a/src/assets/default/delete.svg +++ b/src/assets/default/delete.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/assets/default/edit.svg b/src/assets/default/edit.svg index 90a5d2aa..67b3bee5 100644 --- a/src/assets/default/edit.svg +++ b/src/assets/default/edit.svg @@ -1,10 +1,10 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/src/assets/default/pin.svg b/src/assets/default/pin.svg index fe23fcc2..6ce911fc 100644 --- a/src/assets/default/pin.svg +++ b/src/assets/default/pin.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/src/components/BottomButton/styles.tsx b/src/components/BottomButton/styles.tsx index d31c235f..bcd7dc6d 100644 --- a/src/components/BottomButton/styles.tsx +++ b/src/components/BottomButton/styles.tsx @@ -16,7 +16,7 @@ export const ButtonWrapper = styled.div` export const Button = styled.button<{ disabled: boolean }>` background: ${({ disabled, theme }) => - disabled ? 'linear-gradient(93deg, #FFC1D6 1.22%, #F8D4D4 99.73%)' : theme.colors.gradient}; + disabled ? 'linear-gradient(93deg, #FFC1D6 1.22%, #F8D4D4 99.73%)' : theme.colors.brand.gradient}; border-radius: 0.625rem; font-size: 1rem; width: calc(100% - 2.5rem); diff --git a/src/components/ClothingInfoItem/styles.tsx b/src/components/ClothingInfoItem/styles.tsx index 3a3d5139..fb204351 100644 --- a/src/components/ClothingInfoItem/styles.tsx +++ b/src/components/ClothingInfoItem/styles.tsx @@ -6,7 +6,7 @@ export const ClothingInfoItemContainer = styled.li` display: flex; flex-direction: row; align-items: center; - border: 0.0625rem solid ${({ theme }) => theme.colors.pink2}; + border: 0.0625rem solid ${({ theme }) => theme.colors.brand.primaryLight}; border-radius: 0.5rem; padding: 10px; min-width: 20.9375rem; @@ -25,7 +25,6 @@ export const ClothingInfoLeft = styled.div` .infoDetail { overflow: hidden; - white-space: nowrap; text-overflow: ellipsis; width: 75%; display: flex; @@ -40,7 +39,13 @@ export const ClothingInfoLeft = styled.div` .model { margin-right: auto; color: ${({ theme }) => theme.colors.black}; - //overflow-x: hidden; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; /* 최대 2줄로 제한 */ + -webkit-box-orient: vertical; + word-break: keep-all; /* 단어 단위로 줄바꿈 */ + overflow-wrap: break-word; /* 단어가 너무 길 경우 다음 줄로 넘김 */ } `; diff --git a/src/components/Modal/styles.tsx b/src/components/Modal/styles.tsx index 7dd1de82..6572401f 100644 --- a/src/components/Modal/styles.tsx +++ b/src/components/Modal/styles.tsx @@ -20,11 +20,11 @@ export const ModalContainer = styled.div<{ $isCloseButtonVisible: boolean }>` align-items: center; justify-content: center; text-align: center; - gap: 1rem; + gap: 1.5rem; width: 21.25rem; max-width: calc(100% - 2.5rem); max-height: 30%; - padding: 1.25rem; + padding: 2rem 1.5rem 1.5rem 1.5rem; ${({ $isCloseButtonVisible }) => ($isCloseButtonVisible ? 'padding-top: 2.5rem' : '')}; background-color: ${({ theme }) => theme.colors.white}; border-radius: 0.625rem; diff --git a/src/components/PostItem/style.tsx b/src/components/PostItem/style.tsx index 655f234a..398fce4c 100644 --- a/src/components/PostItem/style.tsx +++ b/src/components/PostItem/style.tsx @@ -63,7 +63,7 @@ export const Pin = styled.img` display: flex; position: absolute; top: 0.75rem; - left: 1.25rem; + left: 0.75rem; justify-content: center; align-items: center; `; diff --git a/src/pages/AccountCancel/index.tsx b/src/pages/AccountCancel/index.tsx index 44ace24c..3f155c35 100644 --- a/src/pages/AccountCancel/index.tsx +++ b/src/pages/AccountCancel/index.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { CancelContainer, SubTitle, Text, InfoBox, InfoItem, CheckboxWrapper } from './styles'; +import { CancelContainer, SubTitle, Text, InfoBox, InfoItem, CheckboxWrapper, CheckboxInput } from './styles'; import { StyledText } from '../../components/Text/StyledText'; import theme from '../../styles/theme'; import { OODDFrame } from '../../components/Frame/Frame'; @@ -74,18 +74,13 @@ const AccountCancel: React.FC = () => { navigate(-1)} /> - + OOTD 탈퇴 전 확인하세요! - - 탈퇴하시면 이용 중인 서비스가 폐쇄되며, - - - - - 모든 데이터는 복구할 수 없습니다. + + {`탈퇴하시면 이용 중인 서비스가 폐쇄되며,\n모든 데이터는 복구할 수 없습니다.`} @@ -102,12 +97,7 @@ const AccountCancel: React.FC = () => {