Skip to content

Commit

Permalink
style : 이모티콘 반응형 수정 (#270)
Browse files Browse the repository at this point in the history
* style : 이모티콘 반응형 수정

* style : datePicker css 수정
  • Loading branch information
kangminguu authored Nov 7, 2024
1 parent 196a579 commit 10f17f7
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 27 deletions.
16 changes: 8 additions & 8 deletions src/entities/KeywordButton/ui/KeywordButton.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const breakpoints = {
};

const media = {
mobile: `@media screen and (min-width: ${breakpoints.mobile})`,
desktop: `@media screen and (min-width: ${breakpoints.desktop})`
mobile: `@media screen and (max-width: ${breakpoints.mobile})`,
desktop: `@media screen and (max-width: ${breakpoints.desktop})`
};

export const StyledButton = styled.button<{ isActive: boolean }>`
Expand All @@ -17,21 +17,21 @@ export const StyledButton = styled.button<{ isActive: boolean }>`
${media.mobile} {
width: 150px;
height: 50px;
gap: 5px;
flex-direction: row;
}
${media.desktop} {
width: 175px;
height: 134px;
gap: 10px;
}
width: 175px;
height: 134px;
gap: 10px;
flex-direction: column;
border: 1px solid
${(props) =>
props.isActive ? 'rgba(0, 0, 0, 0.4)' : 'rgba(0, 0, 0, 0.1)'};
border-radius: 10px;
background-color: #ffffff;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 14px;
Expand Down
17 changes: 10 additions & 7 deletions src/pages/DetailPage/ui/DetailPage.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const ContentContainer = styled.div`
align-items: center;
margin-top: 150px;
@media (max-width: 550px) {
@media (max-width: 768px) {
margin-top: 50px;
}
`;
Expand All @@ -29,7 +29,7 @@ export const Wrap = styled.div`
gap: 10px;
@media (max-width: 550px) {
@media (max-width: 768px) {
flex-direction: column;
}
`;
Expand All @@ -56,21 +56,24 @@ export const EmotionWrap = styled.div`
flex: 1;
width: 100%;
display: flex;
gap: 10px;
@media (max-width: 768px) {
flex-direction: column;
}
`;

export const MainEmotionContainer = styled.div`
flex: 1.2;
@media (max-width: 550px) {
@media (max-width: 768px) {
flex: 1;
}
`;
export const SubEmotionContainer = styled.div`
flex: 2;
@media (max-width: 550px) {
@media (max-width: 768px) {
flex: 1;
}
`;
Expand All @@ -84,7 +87,7 @@ export const ReactionShareWrap = styled.div`
align-items: center;
position: relative;
@media (max-width: 550px) {
@media (max-width: 768px) {
flex-direction: column;
margin: 50px 0;
gap: 20px;
Expand All @@ -99,7 +102,7 @@ export const ShareButtonContainer = styled.div`
position: absolute;
right: 0;
@media (max-width: 550px) {
@media (max-width: 768px) {
position: static;
}
`;
Expand Down
12 changes: 6 additions & 6 deletions src/shared/EmotionIcon/ui/EmotionIcon.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ const breakpoints = {
};

const media = {
mobile: `@media screen and (min-width: ${breakpoints.mobile})`,
desktop: `@media screen and (min-width: ${breakpoints.desktop})`
mobile: `@media screen and (max-width: ${breakpoints.mobile})`,
desktop: `@media screen and (max-width: ${breakpoints.desktop})`
};

export const StyledEmotionIcon = styled.div<{ width: string; height: string }>`
position: relative;
${media.mobile} {
width: 25px;
height: 25px;
}
${media.desktop} {
width: ${({ width }) => width};
height: ${({ height }) => height};
}
width: ${({ width }) => width};
height: ${({ height }) => height};
& > img {
position: absolute;
Expand Down
1 change: 1 addition & 0 deletions src/widgets/date-picker/ui/DatePicker.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'react-calendar/dist/Calendar.css';

export const StyledCalendarWrapper = styled.div`
position: relative;
width: 330px;
display: flex;
justify-content: right;
`;
Expand Down
7 changes: 3 additions & 4 deletions src/widgets/diary-text/ui/DiaryText.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const StyledDiaryTitleContainer = styled.p`
margin: 40px 0 0 0;
padding: 0;
@media (max-width: 550px) {
@media (max-width: 870px) {
flex-direction: column;
gap: 10px;
}
Expand All @@ -37,7 +37,7 @@ export const Wrap = styled.div`
`;

export const StyledDiaryTitle = styled.p`
width: 100%;
padding: 70px 0;
font-size: 28px;
font-weight: 600;
text-align: center;
Expand All @@ -47,13 +47,12 @@ export const StyledDiaryTitle = styled.p`
export const StyledVisibilityButton = styled.div`
position: absolute;
@media (max-width: 550px) {
@media (max-width: 870px) {
position: static;
}
`;

export const StyledDiaryAuthor = styled.p`
width: 100%;
font-size: 16px;
font-weight: 500;
color: #3a3a3a;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ export const Container = styled.div`
font-size: 16px;
font-weight: bold;
font-family: 'Pretendard', sans-serif;
@media (max-width: 768px) {
gap: 10px;
align-items: start;
}
`;

export const SubContainer = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ export const Container = styled.div`
font-size: 16px;
font-weight: bold;
font-family: 'Pretendard', sans-serif;
@media (max-width: 768px) {
gap: 10px;
display: flex;
flex-direction: column;
// align-items: center;
}
`;

export const SubContainer = styled.div`
Expand Down
11 changes: 9 additions & 2 deletions src/widgets/write-diary/ui/WriteDiaryContainer.styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@ export const Container = styled.div`

export const SelectDateContainer = styled.div`
display: flex;
justify-content: space-between;
justify-content: right;
align-items: center;
width: 100%;
`;

export const DateContainer = styled.div`
position: absolute;
left: 0;
font-size: 24px;
font-weight: bold;
font-family: 'Pretendard', sans-serif;
`;

export const DatePickeContainer = styled.div``;
export const DatePickeContainer = styled.div`
width: 100%;
display: flex;
justify-content: right;
`;

export const TitleContainer = styled.div``;

Expand Down

0 comments on commit 10f17f7

Please sign in to comment.