-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feat] main 페이지 디자인 구현 #282
Merged
Merged
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
849d58c
feat: Journey section add
sumi-0011 0e11548
feat: 여정 합류 PC
sumi-0011 afaef4a
feat: layout media query add
sumi-0011 b8cc29f
Merge branch 'feat/journey' into feat/journey-media
sumi-0011 5da8b92
feat: journey mobile
sumi-0011 2965fb1
feat: 모집안내 바로가기 생성
sumi-0011 c3fb6da
refactor: css 분리
sumi-0011 f477c33
Merge branch 'develop' into feat/recruit-entrance
sumi-0011 3b7cac8
fix: build error fix
sumi-0011 6de0437
feat: schedule 상수로 분리, main 에 추가
sumi-0011 25dda3f
style: 14기 일정 추가
sumi-0011 71d067b
style: SectionTitle 반응형 추가
sumi-0011 90a304c
Merge branch 'develop' into feat/main-schedule
5d03de8
feat: faq main component 추가
bc314e0
feat: main sign image 추가
873f125
fix: optional desc 적용
b0ebb49
fix: 설명 있을때만 돔 생성
3edeef6
Merge branch 'fix/schedule-title-style' into feat/main-bottom
91ec204
refactor: main에만 종속되어있는 컴포넌트 구조 변경
f808af7
feat: 14기 지원 버튼 추가 (메인 마지막)
46bdf63
Merge branch 'develop' into feat/main-bottom
sumi-0011 1306b5d
[Style] GNB, Footer 반응형 작업 (#283)
sumi-0011 1bbf8a5
Merge branch 'develop' into feat/main-bottom
sumi-0011 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { css, Theme } from '@emotion/react'; | ||
|
||
import { Button } from '~/components/Button'; | ||
import { commonLayoutCss } from '~/styles/layout'; | ||
import { mediaQuery } from '~/styles/media'; | ||
|
||
export function RecruitTextSection() { | ||
return ( | ||
<section css={[commonLayoutCss, layoutCss]}> | ||
<h1> | ||
서비스 런칭부터 운영까지 <br /> | ||
열정적인 여정에 지금 합류하세요 | ||
</h1> | ||
<Button>14기 지원하기</Button> | ||
</section> | ||
); | ||
} | ||
|
||
const layoutCss = (theme: Theme) => css` | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
gap: 40px; | ||
|
||
h1 { | ||
text-align: center; | ||
color: ${theme.colors.white}; | ||
${theme.typos.decimal.title2}; | ||
} | ||
|
||
${mediaQuery('mobile')} { | ||
h1 { | ||
font-size: 20px; | ||
} | ||
} | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import Image from 'next/image'; | ||
import { css } from '@emotion/react'; | ||
|
||
import { commonLayoutCss } from '~/styles/layout'; | ||
import { mediaQuery } from '~/styles/media'; | ||
|
||
export function SignImageSection() { | ||
return ( | ||
<section css={[commonLayoutCss, layoutCss]}> | ||
<Image src="/images/sign/main.png" fill alt="DPM 14th" /> | ||
</section> | ||
); | ||
} | ||
|
||
const layoutCss = css` | ||
position: relative; | ||
width: 100%; | ||
height: 356px; | ||
img { | ||
width: 100%; | ||
object-fit: contain; | ||
} | ||
|
||
${mediaQuery('tablet')} { | ||
height: 262px; | ||
} | ||
${mediaQuery('mobile')} { | ||
height: 122px; | ||
} | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export { RecruitTextSection } from './RecruitTextSection'; | ||
export { SignImageSection } from './SignImageSection'; |
21 changes: 0 additions & 21 deletions
21
src/components/RecruitEntrance/RecruitEntrance.stories.tsx
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rem 이나 윤호님이 만들어주신 typo 사용하면 좋을 것 같아요 !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이부분은 다른 부분에서도 이런식으로 사용해서, 다른 브랜치에서 한번에 바꾸겠습니다!