Skip to content

Commit 28bc09c

Browse files
authored
Merge pull request #128 from oodd-team/feat/OD-159
[OD-159] 채팅 UI 수정
2 parents ba87c20 + 765b322 commit 28bc09c

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed
Lines changed: 1 addition & 1 deletion
Loading

src/pages/Chats/ChatRoom/ChatBox/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import { useSocket } from '@context/SocketProvider';
77
import { OtherUserAtom } from '@recoil/util/OtherUser';
88
import { getCurrentUserId } from '@utils/getCurrentUserId';
99

10+
import SendIcon from '@assets/default/send-message.svg';
11+
1012
import { ChatBoxContainer, Textarea, SendButton } from './styles';
1113

1214
const ChatBox: React.FC = () => {
@@ -75,7 +77,9 @@ const ChatBox: React.FC = () => {
7577
onKeyDown={handleEnterKeyDown}
7678
onSubmit={handleNewMessageSubmit}
7779
/>
78-
<SendButton $isOtherUserValid={isOtherUserValid} onClick={handleNewMessageSubmit} />
80+
<SendButton $isOtherUserValid={isOtherUserValid} onClick={handleNewMessageSubmit}>
81+
<img src={SendIcon} alt="" />
82+
</SendButton>
7983
</ChatBoxContainer>
8084
);
8185
};

src/pages/Chats/ChatRoom/ChatBox/styles.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { styled } from 'styled-components';
22

3-
import SendIcon from '@assets/default/send-message.svg';
4-
53
export const ChatBoxContainer = styled.div`
64
${({ theme }) => theme.breakPoints};
75
position: fixed;
@@ -14,7 +12,7 @@ export const ChatBoxContainer = styled.div`
1412
padding: 0.5rem 1.12rem;
1513
background-color: ${({ theme }) => theme.colors.background.primary};
1614
gap: 0.5rem;
17-
border-top: 1px solid ${({ theme }) => theme.colors.gray[300]};
15+
/* border-top: 1px solid ${({ theme }) => theme.colors.gray[300]}; */
1816
align-items: center;
1917
`;
2018

@@ -39,12 +37,9 @@ export const Textarea = styled.textarea<{ $isOtherUserValid: boolean }>`
3937
`;
4038

4139
export const SendButton = styled.button<{ $isOtherUserValid: boolean }>`
42-
padding: 1.12rem;
40+
width: 2rem;
41+
height: 2rem;
4342
border-radius: 50%;
44-
background-color: ${({ theme }) => theme.colors.brand.primaryLight};
45-
background-image: url(${SendIcon});
46-
background-repeat: no-repeat;
47-
background-position: center;
48-
background-size: 1.2rem 1.2rem;
43+
/* background-color: ${({ theme }) => theme.colors.brand.primaryLight}; */
4944
cursor: ${({ $isOtherUserValid }) => ($isOtherUserValid ? 'pointer' : '')};
5045
`;

src/pages/Chats/ChatRoom/RcvdMessage/styles.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const FirstMessageLayout = styled.div<{ $isSenderChanged: boolean }>`
1010

1111
export const MessageLayout = styled.div`
1212
display: flex;
13-
margin: 0 auto 0.5rem 2.938rem;
13+
margin: 0 auto 0.5rem 2rem;
1414
`;
1515

1616
export const UserImage = styled.img`

0 commit comments

Comments
 (0)