Skip to content

Commit

Permalink
Revert "작성글/투표글 텍스트 스타일링 수정 및 뒤로가기 버튼 이슈 해결, 댓글 textarea의 placeholder…
Browse files Browse the repository at this point in the history
… font 수정 (#676)" (#678)

This reverts commit a1f21f9.
  • Loading branch information
inyeong-kang authored Sep 21, 2023
1 parent a1f21f9 commit 5f696de
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 46 deletions.
Binary file removed frontend/src/assets/arrow-right.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,6 @@ 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;
Expand All @@ -46,13 +35,14 @@ export const ButtonContainer = styled.div`
`;

export const ButtonWrapper = styled.div`
width: 90px;
width: 60px;
height: 40px;
font: var(--text-caption);
font-weight: 600;
@media (min-width: ${theme.breakpoint.sm}) {
width: 74px;
height: 46px;
font: var(--text-body);
Expand Down
12 changes: 3 additions & 9 deletions frontend/src/components/common/Dashboard/UserProfile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ 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;
}
Expand All @@ -19,16 +18,11 @@ export default function UserProfile({ userInfo }: UserProfileProps) {
<S.NickName>{nickname}</S.NickName>
<S.UserInfoContainer>
<S.TextCardLink to={PATH.USER_POST}>
<S.TextCardTitle>
작성글 <S.Img src={arrowRight} alt="작성글 페이지 이동 화살표" />
</S.TextCardTitle>
<S.TextCardTitle>작성글</S.TextCardTitle>
<S.TextCardContent>{postCount}</S.TextCardContent>
</S.TextCardLink>
<S.TextCardLink to={PATH.USER_VOTE}>
<S.TextCardTitle>
투표수
<S.Img src={arrowRight} alt="투표글 페이지 이동 화살표" />
</S.TextCardTitle>
<S.TextCardTitle>투표수</S.TextCardTitle>
<S.TextCardContent>{voteCount}</S.TextCardContent>
</S.TextCardLink>
</S.UserInfoContainer>
Expand Down
13 changes: 2 additions & 11 deletions frontend/src/components/common/Dashboard/UserProfile/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,12 @@ export const TextCardLink = styled(Link)`
`;

export const TextCardTitle = styled.span`
display: flex;
align-items: center;
gap: 5px;
font: var(--text-caption);
font-weight: 600;
text-decoration: none;
text-decoration: underline;
text-underline-position: under;
`;

export const TextCardContent = styled.span`
font: var(--text-caption);
text-align: center;
`;

export const Img = styled.img`
width: 10px;
height: 10px;
`;
4 changes: 4 additions & 0 deletions frontend/src/components/common/SquareButton/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ export const Button = styled.button<ButtonProps>`
@media (min-width: ${theme.breakpoint.sm}) {
font: var(--text-body);
}
@media (max-width: ${theme.breakpoint.sm}) {
font-size: 12px;
}
`;
3 changes: 1 addition & 2 deletions frontend/src/pages/Ranking/PassionUser/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const Tbody = styled.tbody`
background-color: var(--white);
font-weight: 600;
font-weight: 500;
}
`;

Expand All @@ -39,7 +39,6 @@ export const Th = styled.th`
padding: 10px 0;
font: var(--text-body);
font-weight: 600;
`;

export const RankingTd = styled.td`
Expand Down
1 change: 0 additions & 1 deletion frontend/src/pages/Ranking/PopularPost/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export const Th = styled.th`
padding: 10px 0;
font: var(--text-body);
font-weight: 600;
`;

export const RankingTd = styled.td`
Expand Down
17 changes: 6 additions & 11 deletions frontend/src/pages/post/PostDetail/InnerHeaderPart/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ 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';
Expand Down Expand Up @@ -64,17 +62,14 @@ export default function InnerHeaderPart({
setAction(null);
};

const handleBackButtonClick = () => {
if (window.history.length > 1) {
navigate(-1);
return;
}
navigate(PATH.HOME);
};

return (
<>
<IconButton category="back" onClick={handleBackButtonClick} />
<IconButton
category="back"
onClick={() => {
navigate(-1);
}}
/>
<S.HeaderWrapper>
{!isWriter ? (
<>
Expand Down

0 comments on commit 5f696de

Please sign in to comment.