Skip to content

Commit 5a9b6f0

Browse files
authored
Merge pull request #117 from oodd-team/feat/OD-167
[OD-167] Chats/Home/컴포넌트 컬러시스템 적용
2 parents ff0c36b + a3e4b63 commit 5a9b6f0

38 files changed

Lines changed: 144 additions & 141 deletions

File tree

src/components/BottomSheet/OptionsBottomSheet/ReportBottomSheetMenu/styles.tsx

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,27 @@ export const InputLayout = styled.div`
1111
flex-direction: column;
1212
justify-content: center;
1313
align-items: center;
14+
background-color: ${({ theme }) => theme.colors.background.primary};
15+
padding: 0 1rem;
16+
margin-bottom: 6.25rem;
17+
margin-top: -1rem;
1418
1519
textarea {
1620
display: block;
1721
width: 100%;
1822
height: 5.25rem;
19-
border-radius: 0.5rem;
20-
border: 0.0625rem solid #ededed;
21-
margin-bottom: 5.25rem;
22-
margin-top: -1rem;
23+
padding: 0.8rem 0.9375rem;
2324
outline: none;
24-
padding: 1rem 0.9375rem;
25+
border-radius: 0.5rem;
26+
border: 0.0625rem solid ${({ theme }) => theme.colors.border.divider};
2527
${({ theme }) => theme.fontStyles['body1-medium']};
26-
line-height: 1.25%;
27-
color: #1d1d1d;
28-
background-color: #f8f8f8;
28+
color: ${({ theme }) => theme.colors.text.primary};
29+
background-color: ${({ theme }) => theme.colors.background.secondary};
2930
resize: none;
31+
32+
&::placeholder {
33+
color: ${({ theme }) => theme.colors.text.tertiary};
34+
${({ theme }) => theme.fontStyles['body2-regular']};
35+
}
3036
}
3137
`;

src/components/BottomSheet/OptionsBottomSheet/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ const OptionsBottomSheet: React.FC<OptionsBottomSheetProps> = ({
200200
<ReportModalWrapper onClick={handleBackgroundClick}>
201201
<ReportModalContainer>
202202
<ReportModalHeader>
203-
<StyledText $textTheme={{ style: 'heading1-bold' }} color={theme.colors.white}>
203+
<StyledText $textTheme={{ style: 'heading1-bold' }} color={theme.colors.text.contrast}>
204204
신고 사유 선택
205205
</StyledText>
206206
<CloseButton

src/components/BottomSheet/OptionsBottomSheet/styles.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const ReportModalContainer = styled.div`
3333
justify-content: center;
3434
align-items: center;
3535
border-radius: 0.38rem;
36-
background-color: ${({ theme }) => theme.colors.white};
36+
background-color: ${({ theme }) => theme.colors.background.primary};
3737
`;
3838

3939
export const ReportModalHeader = styled.header`
@@ -44,7 +44,7 @@ export const ReportModalHeader = styled.header`
4444
justify-content: space-between;
4545
align-items: center;
4646
border-radius: 0.38rem 0.38rem 0 0;
47-
background: ${({ theme }) => theme.colors.gradient};
47+
background: ${({ theme }) => theme.colors.brand.gradient};
4848
`;
4949

5050
export const ReportModalBox = styled.section`

src/components/BottomSheet/styles.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const BottomSheetLayout = styled.div.attrs<{ $currentTranslateY: number;
3131
max-width: 512px;
3232
left: 50%;
3333
border-radius: 0.938rem 0.938rem 0 0;
34-
background-color: ${({ theme }) => theme.colors.white};
34+
background-color: ${({ theme }) => theme.colors.background.primary};
3535
padding: 0 1.25rem;
3636
z-index: 200;
3737
user-select: none;
@@ -43,7 +43,7 @@ export const Handler = React.memo(styled.hr`
4343
width: 2.88rem;
4444
margin: 0.6rem auto 0 auto;
4545
height: 0.125rem;
46-
background-color: #d9d9d9;
46+
background-color: ${({ theme }) => theme.colors.gray[300]};
4747
border: none;
4848
border-radius: 0.125rem;
4949
z-index: 300;
@@ -56,7 +56,7 @@ export const SideBarLayout = styled.div<{ $isSideBarOpen: boolean }>`
5656
height: 100%;
5757
position: fixed;
5858
right: 0;
59-
background: white;
59+
background: ${({ theme }) => theme.colors.background.primary};
6060
transform: translateX(${({ $isSideBarOpen }) => ($isSideBarOpen ? 0 : '100%')});
6161
transition: transform 0.3s;
6262
`;

src/components/BottomSheetMenu/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import { StyledText } from '@components/Text/StyledText';
22
import { BottomSheetMenuLayout, SheetItem, IconButton } from './styles';
33
import type { BottomSheetMenuProps, SheetItemDto } from './dto';
44
import React from 'react';
5+
import theme from '@styles/theme';
56

67
const BottomSheetMenu: React.FC<BottomSheetMenuProps> = React.memo(({ items }) => {
78
return (
89
<BottomSheetMenuLayout>
910
{items.map((item: SheetItemDto, index) => (
1011
<div key={index}>
1112
<SheetItem onClick={item.action}>
12-
<StyledText $textTheme={{ style: 'body1-medium' }} color={'#7b7b7b'}>
13+
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.text.tertiary}>
1314
{item.text}
1415
</StyledText>
1516
{item.icon && (

src/components/BottomSheetMenu/styles.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const SheetItem = styled.li`
1313
align-items: center;
1414
justify-content: space-between;
1515
cursor: pointer;
16-
border-bottom: 1px solid rgb(0, 0, 0, 0.2);
16+
border-bottom: 1px solid ${({ theme }) => theme.colors.gray[300]};
1717
`;
1818

1919
export const IconButton = styled.button`

src/components/CommentBottomSheet/Comment/styles.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const SendContainer = styled.div`
1313
width: 100%;
1414
min-height: 2.5rem;
1515
display: flex;
16-
border: 1px solid #ff2389;
16+
border: 1px solid ${({ theme }) => theme.colors.border.active};
1717
border-radius: 0.5rem;
1818
align-items: center;
1919
`;
@@ -27,11 +27,8 @@ export const CommentTextarea = styled.textarea`
2727
background-color: transparent;
2828
resize: none;
2929
overflow: hidden;
30-
font-family: 'Pretendard Variable';
31-
font-size: 1rem;
32-
font-style: normal;
33-
font-weight: 300;
34-
line-height: 1.2rem;
30+
color: ${({ theme }) => theme.colors.text.primary};
31+
${({ theme }) => theme.fontStyles['body2-regular']};
3532
`;
3633

3734
export const SendButton = styled.button`

src/components/CommentBottomSheet/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const CommentBottomSheet: React.FC<CommentBottomSheetProps> = ({
5252
<CommentModalWrapper onClick={handleBackgroundClick}>
5353
<CommentModalContainer>
5454
<CommentModalHeader>
55-
<StyledText $textTheme={{ style: 'heading1-bold' }} color={theme.colors.white}>
56-
메시지 보내기
55+
<StyledText $textTheme={{ style: 'heading1-bold' }} color={theme.colors.text.contrast}>
56+
매칭 요청
5757
</StyledText>
5858
<CloseButton onClick={handleCloseButtonClick}>
5959
<img src={closeIcon} alt="닫기" />

src/components/CommentBottomSheet/styles.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const CommentModalContainer = styled.div`
3333
justify-content: center;
3434
align-items: center;
3535
border-radius: 0.38rem;
36-
background-color: ${({ theme }) => theme.colors.white};
36+
background-color: ${({ theme }) => theme.colors.background.primary};
3737
`;
3838

3939
export const CommentModalHeader = styled.header`
@@ -44,7 +44,7 @@ export const CommentModalHeader = styled.header`
4444
justify-content: space-between;
4545
align-items: center;
4646
border-radius: 0.38rem 0.38rem 0 0;
47-
background: ${({ theme }) => theme.colors.gradient};
47+
background: ${({ theme }) => theme.colors.brand.gradient};
4848
`;
4949

5050
export const CommentModalBox = styled.section`

src/components/Frame/Frame.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import theme from '@styles/theme';
33

44
export const OODDFrame = styled.div`
55
${theme.breakPoints};
6-
background-color: ${({ theme }) => theme.colors.white};
6+
background-color: ${({ theme }) => theme.colors.background.primary};
77
height: 100vh;
88
margin: auto;
99
display: flex;

0 commit comments

Comments
 (0)