-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge : 메인 페이지 css 및 중복 컴포넌트화 #33
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c6ad83e
Feat : main page css #10
sheepdog13 e7ac32c
Feat : user modal 구현 loading height 수정 #10
sheepdog13 1cdc46c
Style : 반응형 구현 #10
sheepdog13 a0fa5de
Style : modal 컴포넌트 폴더정리 #10
sheepdog13 e0f2fe3
Refact : NavigationBar 컴포넌트 #10
sheepdog13 9d90d50
Feat : main page app에 적용
sheepdog13 96db077
Style : 컨벤션에 따라 변수명, 함수명 변경
sheepdog13 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
Style : modal 컴포넌트 폴더정리 #10
- modal 컴포넌트를 따로 폴더를 만들어서 정리했습니다
- Loading branch information
commit a0fa5de3be51610e33c66e05af3fca9ad58336e5
There are no files selected for viewing
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,102 @@ | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
import { media } from '../../style/mediaQuery'; | ||
|
||
const Wapper = styled.div` | ||
${media.smallMobile` | ||
top: 36px; | ||
padding: 10px; | ||
`} | ||
${media.largeMobile` | ||
top: 41px; | ||
padding: 10px; | ||
`} | ||
position: absolute; | ||
top: 53px; | ||
right: 4px; | ||
padding: 15px; | ||
display: flex; | ||
flex-direction: column; | ||
justify-content: center; | ||
align-items: center; | ||
gap: 15px; | ||
border-radius: 5px; | ||
border: 0.5px solid #d3d3d3; | ||
background: #fff; | ||
p { | ||
display: flex; | ||
} | ||
`; | ||
|
||
const ModalBox = styled.div` | ||
${media.largeMobile` | ||
gap: 8px; | ||
p { | ||
font-size: 12px; | ||
} | ||
`} | ||
display: flex; | ||
flex-direction: row; | ||
align-items: center; | ||
gap: 10px; | ||
`; | ||
|
||
const ModalIconBox = styled.div<{ color: string }>` | ||
${media.smallMobile` | ||
width: 18px; | ||
height: 18px; | ||
`} | ||
${media.largeMobile` | ||
width: 20px; | ||
height: 20px; | ||
`} | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
width: 25px; | ||
height: 25px; | ||
border-radius: 50%; | ||
background-color: ${(props) => props.color}; | ||
`; | ||
|
||
const ModalImg = styled.img<{ size: string }>` | ||
${media.smallMobile` | ||
width: 10px; | ||
height: 10px; | ||
`} | ||
${media.largeMobile` | ||
width: 12px; | ||
height: 12px; | ||
`} | ||
width: ${(props) => props.size}; | ||
height: ${(props) => props.size}; | ||
`; | ||
|
||
function UserModal() { | ||
return ( | ||
<Wapper> | ||
<ModalBox> | ||
<ModalIconBox color="#FF2868"> | ||
<ModalImg | ||
size="15px" | ||
src={`${process.env.PUBLIC_URL}/img/logout.webp`} | ||
alt="connect" | ||
/> | ||
</ModalIconBox> | ||
<p>로그아웃</p> | ||
</ModalBox> | ||
<ModalBox> | ||
<ModalIconBox color="#5562EA"> | ||
<ModalImg | ||
size="15px" | ||
src={`${process.env.PUBLIC_URL}/img/profile.webp`} | ||
alt="connect" | ||
/> | ||
</ModalIconBox> | ||
<p>회원정보</p> | ||
</ModalBox> | ||
</Wapper> | ||
); | ||
} | ||
|
||
export default UserModal; |
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.
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.
Wapper는 무슨 뜻인가요?
Wrapper와 역할과 변수명이 비슷한거같습니다.
오타라면 수정이 필요할거같네요
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.
오타네요 컨벤션에 따라서 고쳐보겠습니다