Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
chaeyeonan committed Sep 20, 2023
2 parents 9010ddb + 158e3d0 commit 26eaad9
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/components/common/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ export const QTitleCard = () => {
<Tag tagType={'question'}>
<CategoryLabel>์ผ์ƒ</CategoryLabel>
</Tag>
<Title>๊ธ€ ์ œ๋ชฉ์ž…๋‹ˆ๋‹ค ๊ธ€ ์ œ๋ชฉ์ž…๋‹ˆ๋‹ค ๊ธ€ ์ œ๋ชฉ์ž…๋‹ˆ๋‹ค ๊ธ€ ์ œ๋ชฉ์ž…๋‹ˆ๋‹ค</Title>
<Title>
์ผ์ด์‚ผ์‚ฌ์˜ค๋ฅ™์น ํŒ”๊ตฌ์‹ญ์ผ์ด์‚ผ์‚ฌ์˜ค๋ฅ™์น ํŒ”๊ตฌ์‹ญ์ผ์ด์‚ผ์‚ฌ์˜ค๋ฅ™์น ํŒ”๊ตฌ์‹ญ์ผ์ด์‚ผ์‚ฌ์˜ค๋ฅ™์น ํŒ”๊ตฌ์‹ญ์ผ์ด์‚ผ์‚ฌ์˜ค๋ฅ™์น ํŒ”๊ตฌ์‹ญ
</Title>
<Date>2023.09.11</Date>
</Container>
);
Expand All @@ -30,7 +32,7 @@ export const QContentCard = () => {
return (
<Container height={317} color={Palette.Main05} gap={14}>
<Tag tagType={'question'}>
<Typo.b2 color={Palette.Main}>์งˆ๋ฌธ ๋‚ด์šฉ</Typo.b2>
<Typo.b2>์งˆ๋ฌธ ๋‚ด์šฉ</Typo.b2>
</Tag>
<ScrollBox>
๋กœ๋ ˜ ์ž…์ˆจ(lorem ipsum; ์ค„์—ฌ์„œ ๋ฆฝ์ˆจ, lipsum)์€ ์ถœํŒ์ด๋‚˜ ๊ทธ๋ž˜ํ”ฝ ๋””์ž์ธ
Expand Down Expand Up @@ -167,6 +169,7 @@ const Title = styled(Typo.h1)`
display: flex;
justify-content: center;
align-items: center;
text-align: center;
`;
const AnsTitle = styled(Typo.h2)`
height: 100%;
Expand Down

0 comments on commit 26eaad9

Please sign in to comment.