From ccb90a7871f16a505eb04e59bf5a5d0873c958e9 Mon Sep 17 00:00:00 2001 From: asaei623 <86418308+asaei623@users.noreply.github.com> Date: Thu, 21 Sep 2023 00:56:34 +0900 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Card.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/common/Card.tsx b/src/components/common/Card.tsx index 44277ad..863617d 100644 --- a/src/components/common/Card.tsx +++ b/src/components/common/Card.tsx @@ -21,7 +21,9 @@ export const QTitleCard = () => { 일상 - 글 제목입니다 글 제목입니다 글 제목입니다 글 제목입니다 + + 일이삼사오륙칠팔구십일이삼사오륙칠팔구십일이삼사오륙칠팔구십일이삼사오륙칠팔구십일이삼사오륙칠팔구십 + 2023.09.11 ); @@ -30,7 +32,7 @@ export const QContentCard = () => { return ( - 질문 내용 + 질문 내용 로렘 입숨(lorem ipsum; 줄여서 립숨, lipsum)은 출판이나 그래픽 디자인 @@ -146,6 +148,7 @@ const Date = ({ children }: { children: string }) => { const Container = styled(Column)<{ height?: number; color: string }>` width: 330px; + max-width: 100%; ${({ height }) => height && `height: ${height}px`}; padding: 27px 28px; @@ -167,6 +170,7 @@ const Title = styled(Typo.h1)` display: flex; justify-content: center; align-items: center; + text-align: center; `; const AnsTitle = styled(Typo.h2)` height: 100%; From 158e3d03a04c509db1b743e5a002ae0c0875b12e Mon Sep 17 00:00:00 2001 From: asaei623 <86418308+asaei623@users.noreply.github.com> Date: Thu, 21 Sep 2023 00:56:49 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=A7=88=EB=AC=B8=ED=95=98=EA=B8=B0?= =?UTF-8?q?=EC=97=90=20=EC=97=B0=EA=B2=B0=EB=90=9C=20uri=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Homebar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/common/Homebar.tsx b/src/components/common/Homebar.tsx index 400309e..276d5f5 100644 --- a/src/components/common/Homebar.tsx +++ b/src/components/common/Homebar.tsx @@ -33,8 +33,8 @@ const Homebar = () => { 답변하기 ) : ( - - + + 질문하기 )} From 9010ddbd859c6582a2fcfeece74d0985a1a075f9 Mon Sep 17 00:00:00 2001 From: chaeyeonan Date: Thu, 21 Sep 2023 01:12:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?style:=20height=20=EB=AA=A8=EB=B0=94?= =?UTF-8?q?=EC=9D=BC=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/common.ts | 8 +++++++- src/components/Answer/Notice.tsx | 1 - src/components/Category/CategoryBar.tsx | 2 +- src/components/common/Card.tsx | 2 +- src/components/common/Homebar.tsx | 4 ++-- src/pages/Answer/WriteAnswer/index.tsx | 7 +++++-- src/pages/Answer/index.tsx | 12 +++++++----- src/pages/Ask/WriteQuestion/index.tsx | 5 ++++- src/pages/Ask/index.tsx | 2 +- src/pages/Main/index.tsx | 24 ++++++++++++++---------- 10 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/assets/common.ts b/src/assets/common.ts index cc18065..55fb2ca 100644 --- a/src/assets/common.ts +++ b/src/assets/common.ts @@ -5,8 +5,9 @@ import { Palette } from 'styles/Palette'; export const EntireContainer = styled.div<{ homebar?: boolean; background?: string; + padding?: string; }>` - padding: 25px 30px; + padding: ${({ padding }) => (padding ? padding : '25px 30px')}; background: ${({ background }) => (background ? background : Palette.White)}; height: ${({ homebar }) => homebar ? 'calc(100dvh - 156px)' : 'calc(100dvh - 60px)'}; @@ -16,6 +17,11 @@ export const EntireContainer = styled.div<{ display: none; } + // 쥬시글 둘러보기 메인페이지 + .padding-container { + padding: 0px 30px; + } + // 마이페이지 .mypage-submenu-container { padding: 40px 0px; diff --git a/src/components/Answer/Notice.tsx b/src/components/Answer/Notice.tsx index c9c6b3f..e56a67b 100644 --- a/src/components/Answer/Notice.tsx +++ b/src/components/Answer/Notice.tsx @@ -14,7 +14,6 @@ const Notice = () => { export default Notice; const Container = styled(Column)` - padding: 30px; padding-bottom: 10px; gap: 5px; `; diff --git a/src/components/Category/CategoryBar.tsx b/src/components/Category/CategoryBar.tsx index dfce3af..3239e27 100644 --- a/src/components/Category/CategoryBar.tsx +++ b/src/components/Category/CategoryBar.tsx @@ -57,7 +57,7 @@ const Categories = ({ ctgAll }: { ctgAll: boolean }) => { const Container = styled(Column)` width: 100%; gap: 6px; - padding: 10px 30px; + padding: 10px 0; `; const Title = () => { return 카테고리; diff --git a/src/components/common/Card.tsx b/src/components/common/Card.tsx index 44277ad..08a1406 100644 --- a/src/components/common/Card.tsx +++ b/src/components/common/Card.tsx @@ -145,7 +145,7 @@ const Date = ({ children }: { children: string }) => { /* styles */ const Container = styled(Column)<{ height?: number; color: string }>` - width: 330px; + width: 100%; ${({ height }) => height && `height: ${height}px`}; padding: 27px 28px; diff --git a/src/components/common/Homebar.tsx b/src/components/common/Homebar.tsx index 400309e..276d5f5 100644 --- a/src/components/common/Homebar.tsx +++ b/src/components/common/Homebar.tsx @@ -33,8 +33,8 @@ const Homebar = () => { 답변하기 ) : ( - - + + 질문하기 )} diff --git a/src/pages/Answer/WriteAnswer/index.tsx b/src/pages/Answer/WriteAnswer/index.tsx index 51f4fac..671c1cf 100644 --- a/src/pages/Answer/WriteAnswer/index.tsx +++ b/src/pages/Answer/WriteAnswer/index.tsx @@ -8,10 +8,13 @@ import { Palette } from 'styles/Palette'; const WriteAnswer = () => { return ( -
+
답변하기
- + { return (
답변하기
- - - - - + +
+ + + + +
diff --git a/src/pages/Ask/WriteQuestion/index.tsx b/src/pages/Ask/WriteQuestion/index.tsx index 3d6bfc1..64b9aaa 100644 --- a/src/pages/Ask/WriteQuestion/index.tsx +++ b/src/pages/Ask/WriteQuestion/index.tsx @@ -14,7 +14,10 @@ const WriteQuestion = () => {
질문하기
- + 제목(최대 100자) diff --git a/src/pages/Ask/index.tsx b/src/pages/Ask/index.tsx index 3947211..148fa06 100644 --- a/src/pages/Ask/index.tsx +++ b/src/pages/Ask/index.tsx @@ -11,7 +11,7 @@ const Ask = () => { return ( <Column> <Header borderBottom={false}>질문하기</Header> - <EntireContainer> + <EntireContainer homebar={true}> <InnerContainer justifyContent="space-between"> <CTAText /> <InnerContents> diff --git a/src/pages/Main/index.tsx b/src/pages/Main/index.tsx index 1b8ad81..a8a4ef3 100644 --- a/src/pages/Main/index.tsx +++ b/src/pages/Main/index.tsx @@ -22,17 +22,21 @@ const Main = () => { <Header borderBottom={false} btn={'search'}> 쥬시글 </Header> - <Column color={Palette.Gray05}> - <CategoryBar ctgAll={true} /> - <CallToAction /> - </Column> - <EntireContainer> - <Column gap={26}> - <StyledLink to="/post/1"> - <CardSlider cards={cards} /> - </StyledLink> - <CardSlider cards={cards} /> + <EntireContainer homebar={true} padding="25px 0px"> + <Column color={Palette.Gray05}> + <div className="padding-container"> + <CategoryBar ctgAll={true} /> + </div> + <CallToAction /> </Column> + <div className="padding-container"> + <Column gap={26}> + <StyledLink to="/post/1"> + <CardSlider cards={cards} /> + </StyledLink> + <CardSlider cards={cards} /> + </Column> + </div> </EntireContainer> <Homebar /> </Column>