Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/common/Post/PostBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ const PostContent = styled.div<{ hasImage: boolean }>`
font-weight: var(--string-weight-regular, 400);
line-height: var(--string-lineheight-feedcontent_height20, 20px);
cursor: pointer;
white-space: pre-wrap; // 개행문자 유지
/* word-wrap: break-word; // 긴 텍스트 줄바꿈 */

display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: ${({ hasImage }) => (hasImage ? 3 : 8)};
-webkit-line-clamp: ${({ hasImage }) => (hasImage ? 4 : 8)};
overflow: hidden;
text-overflow: ellipsis;
}
Expand Down Expand Up @@ -84,7 +86,7 @@ const PostBody = ({

return (
<Container onClick={() => handlePostClick(feedId)}>
<div onClick={(e) => e.stopPropagation()}>
<div onClick={e => e.stopPropagation()}>
<BookInfoCard bookTitle={bookTitle} bookAuthor={bookAuthor} isbn={isbn} />
</div>
<PostContent hasImage={hasImage}>
Expand Down
2 changes: 2 additions & 0 deletions src/components/feed/FeedDetailPostBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const PostContent = styled.div<{ hasImage: boolean }>`
font-size: var(--string-size-medium01, 14px);
font-weight: var(--string-weight-regular, 400);
line-height: var(--string-lineheight-feedcontent_height20, 20px);
white-space: pre-wrap; // 개행문자 유지
word-wrap: break-word; // 긴 텍스트 줄바꿈
}

.imgContainer {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/mypage/Mypage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ const UserProfile = styled.div`
display: flex;
flex-direction: row;
align-items: center;
gap: 4px;
gap: 8px;

img {
width: 54px;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/signup/SignupGenre.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ const SignupGenre = () => {
state: {
nickname: nickname,
aliasName: selectedAlias.subTitle,
aliasColor: genres.find(g => g.id === selectedAlias.id)?.color,
aliasIconUrl: genres.find(g => g.id === selectedAlias.id)?.iconUrl,
aliasColor: genres.find(g => g.subTitle === selectedAlias.subTitle)?.color,
aliasIconUrl: genres.find(g => g.subTitle === selectedAlias.subTitle)?.iconUrl,
},
});
} else {
Expand Down
5 changes: 5 additions & 0 deletions src/styles/global/global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ export const globalStyles = css`
box-sizing: border-box;
}

/* Input 요소 전역 스타일 */
input {
caret-color: ${colors.neongreen};
}

${coreDesignTokens}
`;

Expand Down