Skip to content
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.

Sign up for GitHub

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

Jump to bottom

hotfix: css 밀리는 현상 수정 #581

Merged
merged 1 commit into from
Sep 20, 2023
Merged

hotfix: css 밀리는 현상 수정 #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions frontend/src/components/ListFilter/ListFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ const ListFilter = ({ options, selectOption, width, fontSize }: Props) => {
<S.FilterContainer>
<S.FilterList $width={width}>
{options.map((option) => (
<S.FilterItem key={option.value}>
<S.FilterButton
onClick={makeHandleClickOption(option.value)}
$isSelected={option.selected}
$fontSize={fontSize}
>
{option.label}
</S.FilterButton>
</S.FilterItem>
<S.ButtonWrapper key={option.value}>
<S.FilterItem>
<S.FilterButton
onClick={makeHandleClickOption(option.value)}
$isSelected={option.selected}
$fontSize={fontSize}
>
{option.label}
</S.FilterButton>
</S.FilterItem>
</S.ButtonWrapper>
))}
</S.FilterList>
</S.FilterContainer>
Expand Down Expand Up @@ -100,4 +102,8 @@ const S = {
${({ $isSelected }) => ($isSelected ? underLine : null)}
}
`,

ButtonWrapper: styled.div`
width: 150px;
`,
};
2 changes: 1 addition & 1 deletion frontend/src/components/MyPage/MyPagePostButton/MyPagePostButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const S = {

@media (max-width: 768px) {
width: 100%;
margin-top: 18px;
margin-top: 15px;
}
`,
};
4 changes: 4 additions & 0 deletions frontend/src/components/RunnerPost/RunnerPostItem/RunnerPostItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ const S = {
`,

TagContainer: styled.div`
@media (max-width: 768px) {
max-width: 200px;
}

& span {
margin-right: 10px;

Expand Down
5 changes: 2 additions & 3 deletions frontend/src/components/common/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,15 @@ const S = {
width: ${({ $width }) => $width || '180px'};
height: ${({ $height }) => $height || '40px'};

padding: 10px 10px;
padding: 5px 0;

font-size: ${({ $fontSize }) => $fontSize || '18px'};
font-weight: ${({ $fontWeight }) => $fontWeight || '400'};

visibility: ${({ $disabled }) => ($disabled ? 'hidden' : 'visible')};
display: ${({ $disabled }) => ($disabled ? 'none' : 'block')};

@media (max-width: 768px) {
width: ${({ $width }) => $width || '180px'};
height: 100%;
}
`,
};
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/layout/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,13 @@ const Header = () => {
{isMobile ? null : <S.ProfileName>{profile?.name}</S.ProfileName>}
<Avatar width="35px" height="35px" imageUrl={profile?.imageUrl || 'https://via.placeholder.com/150'} />
</S.AvatarContainer>
<Button fontSize="14px" width="76px" height="35px" colorTheme="WHITE" onClick={handleClickLogoutButton}>
<Button
fontSize="14px"
width={isMobile ? '80px' : '85px'}
height="35px"
colorTheme="WHITE"
onClick={handleClickLogoutButton}
>
로그아웃
</Button>
</>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/mocks/data/myPageRunnerProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"company": "한국외국어대학교",
"imageUrl": "https://avatars.githubusercontent.com/u/62369936?v=4",
"githubUrl": "https://github.com/gyeongza",
"introduction": "안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️안녕하세요 프론트엔드 공부중인 비전공자 학생입니다🖥️",
"introduction": "입니다🖥️",
"technicalTags": ["javascript", "react", "typescript"]
}
2 changes: 1 addition & 1 deletion frontend/src/pages/MainPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ const MainPage = () => {
</S.LeftSideContainer>
<S.RightSideContainer>
<Button
width="100%"
width={isMobile ? '160px' : '190px'}
onClick={handleClickPostButton}
colorTheme="WHITE"
fontSize={isMobile ? '14px' : '18px'}
Expand Down