From 7d7e18419bb841de1a1395f5094bc72b3f3ff9d2 Mon Sep 17 00:00:00 2001 From: jero_kang <81199414+inyeong-kang@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:00:16 +0900 Subject: [PATCH] =?UTF-8?q?Fix/#671=20(UserProfile=20=EB=B0=91=EC=A4=84=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=EB=93=B1=20UI=20=EC=88=98=EC=A0=95)=20(#6?= =?UTF-8?q?80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: (#671) 복사된 링크로 접속 시 뒤로 가기 버튼이 작동하지 않는 이슈 해결 * design: (#671) 댓글 textarea의 placeholder font 스타일 수정 * design: (#672) 링크 넣기 버튼 font 크기 수정 * fix: (#672) 작성글/투표글 수 밑줄 제거, 화살표 아이콘으로 대체 * design: (#672) 화살표 이미지 width, height 수정 * chore: (#672) 화살표 위치 수정 * design: (#672) 랭킹 페이지 table의 헤더 및 내 랭킹 font weight 변경 --- frontend/src/assets/arrow-right.png | Bin 0 -> 474 bytes .../CommentList/CommentTextForm/style.ts | 14 ++++++++++++-- .../common/Dashboard/UserProfile/index.tsx | 12 +++++++++--- .../common/Dashboard/UserProfile/style.ts | 13 +++++++++++-- .../components/common/SquareButton/style.ts | 4 ---- .../src/pages/Ranking/PassionUser/style.ts | 3 ++- .../src/pages/Ranking/PopularPost/style.ts | 1 + .../post/PostDetail/InnerHeaderPart/index.tsx | 17 +++++++++++------ 8 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 frontend/src/assets/arrow-right.png diff --git a/frontend/src/assets/arrow-right.png b/frontend/src/assets/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f76111f5ff7d5c8920ecdbc7b270e2db6ad28618 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{0wkH`a%F*(Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeM~FY)wsWq-~o%E~CQ@SpxJ zpwK=~7sn8d^SzfhdNBovusz`CJhDLZIGg(HQ!C{Txfh%}xN^Bh)4T;IJvgNtB zY{7<|OPzFHS=Cb8+2|xhs>SEv262y?LI& z(Z9>A*yPNYx6d*-_^no1O5Kaic#`qM@XEQ10`s;m2>K^){cTf8)|7>bE1t`lT|30j zoIdZ=Mzx)L&&6auvnp5;_U^!)udmYn_I`bIXX*C;ll9g=xV*Oc(xmCzOOvW)qZl?s zOz~XyR{k&0C#of`5hW>!C8<`)MX5lF!N|bKSl7T(*T^u$z|_jX(8|a}+rYrez~E}h znkp0xx%nxXX_dG&EYTD>2GpPdx1l66H?_DVF}DD>p3gR>l0ZESp00i_>zopr0MdG} AqW}N^ literal 0 HcmV?d00001 diff --git a/frontend/src/components/comment/CommentList/CommentTextForm/style.ts b/frontend/src/components/comment/CommentList/CommentTextForm/style.ts index d19035595..8b559482b 100644 --- a/frontend/src/components/comment/CommentList/CommentTextForm/style.ts +++ b/frontend/src/components/comment/CommentList/CommentTextForm/style.ts @@ -19,6 +19,17 @@ export const TextArea = styled.textarea` resize: none; + &::placeholder { + font-size: 14px; + } + + @media (max-width: ${theme.breakpoint.sm}) { + &::placeholder { + font-size: 12px; + line-height: 2rem; + } + } + @media (min-width: ${theme.breakpoint.sm}) { height: 160px; @@ -35,14 +46,13 @@ export const ButtonContainer = styled.div` `; export const ButtonWrapper = styled.div` - width: 60px; + width: 90px; height: 40px; font: var(--text-caption); font-weight: 600; @media (min-width: ${theme.breakpoint.sm}) { - width: 74px; height: 46px; font: var(--text-body); diff --git a/frontend/src/components/common/Dashboard/UserProfile/index.tsx b/frontend/src/components/common/Dashboard/UserProfile/index.tsx index 1fdf26a05..2630478c0 100644 --- a/frontend/src/components/common/Dashboard/UserProfile/index.tsx +++ b/frontend/src/components/common/Dashboard/UserProfile/index.tsx @@ -2,10 +2,11 @@ import { User } from '@type/user'; import { PATH } from '@constants/path'; +import arrowRight from '@assets/arrow-right.png'; + import * as PS from '../profileStyle'; import * as S from './style'; - interface UserProfileProps { userInfo: User; } @@ -18,11 +19,16 @@ export default function UserProfile({ userInfo }: UserProfileProps) { {nickname} - 작성글 + + 작성글 + {postCount} - 투표수 + + 투표수 + + {voteCount} diff --git a/frontend/src/components/common/Dashboard/UserProfile/style.ts b/frontend/src/components/common/Dashboard/UserProfile/style.ts index a4a52684f..b006435da 100644 --- a/frontend/src/components/common/Dashboard/UserProfile/style.ts +++ b/frontend/src/components/common/Dashboard/UserProfile/style.ts @@ -33,12 +33,21 @@ export const TextCardLink = styled(Link)` `; export const TextCardTitle = styled.span` + display: flex; + align-items: center; + gap: 5px; + font: var(--text-caption); - text-decoration: underline; - text-underline-position: under; + font-weight: 600; + text-decoration: none; `; export const TextCardContent = styled.span` font: var(--text-caption); text-align: center; `; + +export const Img = styled.img` + width: 10px; + height: 10px; +`; diff --git a/frontend/src/components/common/SquareButton/style.ts b/frontend/src/components/common/SquareButton/style.ts index 5b66fa3df..a94729808 100644 --- a/frontend/src/components/common/SquareButton/style.ts +++ b/frontend/src/components/common/SquareButton/style.ts @@ -42,8 +42,4 @@ export const Button = styled.button` @media (min-width: ${theme.breakpoint.sm}) { font: var(--text-body); } - - @media (max-width: ${theme.breakpoint.sm}) { - font-size: 12px; - } `; diff --git a/frontend/src/pages/Ranking/PassionUser/style.ts b/frontend/src/pages/Ranking/PassionUser/style.ts index b3487356a..40a550626 100644 --- a/frontend/src/pages/Ranking/PassionUser/style.ts +++ b/frontend/src/pages/Ranking/PassionUser/style.ts @@ -25,7 +25,7 @@ export const Tbody = styled.tbody` background-color: var(--white); - font-weight: 500; + font-weight: 600; } `; @@ -39,6 +39,7 @@ export const Th = styled.th` padding: 10px 0; font: var(--text-body); + font-weight: 600; `; export const RankingTd = styled.td` diff --git a/frontend/src/pages/Ranking/PopularPost/style.ts b/frontend/src/pages/Ranking/PopularPost/style.ts index 6fa21c1f9..fdca41fb9 100644 --- a/frontend/src/pages/Ranking/PopularPost/style.ts +++ b/frontend/src/pages/Ranking/PopularPost/style.ts @@ -17,6 +17,7 @@ export const Th = styled.th` padding: 10px 0; font: var(--text-body); + font-weight: 600; `; export const RankingTd = styled.td` diff --git a/frontend/src/pages/post/PostDetail/InnerHeaderPart/index.tsx b/frontend/src/pages/post/PostDetail/InnerHeaderPart/index.tsx index 6fdbd7164..e5f7af661 100644 --- a/frontend/src/pages/post/PostDetail/InnerHeaderPart/index.tsx +++ b/frontend/src/pages/post/PostDetail/InnerHeaderPart/index.tsx @@ -12,6 +12,8 @@ import PostMenu from '@components/common/PostMenu'; import TagButton from '@components/common/TagButton'; import ReportModal from '@components/ReportModal'; +import { PATH } from '@constants/path'; + import { LoadingType } from '../types'; import * as S from './style'; @@ -62,14 +64,17 @@ export default function InnerHeaderPart({ setAction(null); }; + const handleBackButtonClick = () => { + if (window.history.length > 1) { + navigate(-1); + return; + } + navigate(PATH.HOME); + }; + return ( <> - { - navigate(-1); - }} - /> + {!isWriter ? ( <>