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.

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

반응형 디자인 수정 (issue #730) #733

Merged
merged 3 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import styled from 'styled-components';
import CommentCount from '@/assets/images/comment-count.svg';
import media from '@/styles/mediaQueries';

// Content

Expand All @@ -26,20 +27,28 @@ export const ItemContainer = styled.div`
&:hover {
transform: scale(1.01);
}

${media.small`
padding: 1.4rem 2rem;
`}
`;

export const BadgeWrapper = styled.div`
display: flex;
gap: 0.7rem;
flex-wrap: wrap;
`;

export const ContentWrapper = styled.div`
display: flex;
flex-direction: column;
gap: 0.5rem;
flex: 1;
`;

export const Title = styled.p`
width: 100%;
word-break: break-all;
color: ${(props) => props.theme.colors.black};
${(props) => props.theme.font.body}
`;
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/components/common/Badge/Badge.styled.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import styled, { css } from 'styled-components';
import type { BadgeVariant } from '.';
import type { DefaultTheme } from 'styled-components/dist/types';
import media from '@/styles/mediaQueries';

interface BadgeContainerProps {
$variant: BadgeVariant;
Expand Down Expand Up @@ -32,5 +33,12 @@ export const BadgeContainer = styled.div<BadgeContainerProps>`
width: fit-content;
padding: 0.4rem 0.8rem;
border-radius: 0.4rem;
white-space: wrap;
white-space: nowrap;
-webkit-line-clamp: 1;
text-overflow: ellipsis;
overflow: hidden;

${media.small`
max-width: 10rem;
`}
`;
2 changes: 1 addition & 1 deletion frontend/src/components/common/Card/Card.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ export const Content = styled.div`
justify-content: space-between;

${media.medium`
min-height: 15rem;
min-height: 15.3rem;
`}
`;
1 change: 1 addition & 0 deletions frontend/src/components/common/TagList/TagList.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const Container = styled.div`
display: flex;
flex-direction: column;
gap: 0.7rem;
flex-wrap: wrap;
`;

export const Label = styled.p`
Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/MainPage/MainPage.styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const MissionListWrapper = styled.div`
margin: 0 auto;
padding: 0 1.5rem;
max-width: 100rem;
width: 100%;
`;

export const MissionListTitle = styled.h2`
Expand Down
Loading