Skip to content

Commit

Permalink
Merge pull request #11 from chhw130/dev
Browse files Browse the repository at this point in the history
feat : chatting Input 레이아웃 배치
  • Loading branch information
chhw130 authored Dec 13, 2023
2 parents 8e3b3cb + 434cff9 commit 5884cdc
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
24 changes: 23 additions & 1 deletion component/card/ChattingRoom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,19 @@ const ChattingRoom = () => {
borderRadius={"12px 12px 0 0"}
position={"absolute"}
bottom={"0"}
overflow={"scroll"}
overflow={"hidden"}
overflowY={"scroll"}
css={{
"&::-webkit-scrollbar": {
width: "4px",
},
"&::-webkit-scrollbar-track": {
width: "6px",
},
"&::-webkit-scrollbar-thumb": {
borderRadius: "24px",
},
}}
flexDir={"column"}
>
<VStack
Expand Down Expand Up @@ -46,6 +58,7 @@ const ChattingRoom = () => {
alignItems={"flex-start"}
spacing={"16px"}
marginTop={"10px"}
paddingBottom={"80px"}
>
<ChattingMsgCard>반갑습니다 00님</ChattingMsgCard>
<ChattingMsgCard>
Expand All @@ -57,6 +70,15 @@ const ChattingRoom = () => {
</Text>
</ChattingMsgCard>

<UserChattingMsgCard>
아침은 계란후라이 점심은 마라탕 저녁은 칼국수를 먹었어
</UserChattingMsgCard>
<UserChattingMsgCard>
아침은 계란후라이 점심은 마라탕 저녁은 칼국수를 먹었어
</UserChattingMsgCard>
<UserChattingMsgCard>
아침은 계란후라이 점심은 마라탕 저녁은 칼국수를 먹었어
</UserChattingMsgCard>
<UserChattingMsgCard>
아침은 계란후라이 점심은 마라탕 저녁은 칼국수를 먹었어
</UserChattingMsgCard>
Expand Down
7 changes: 4 additions & 3 deletions component/input/ChattingInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ const ChattingInput = () => {
return (
<>
<Flex
position={"absolute"}
bottom={"10px"}
position={"fixed"}
bottom={"0px"}
bgColor={"white"}
w={"100%"}
padding={"0 22px"}
padding={"10px 22px"}
justifyContent={"space-between"}
alignItems={"center"}
>
Expand Down

0 comments on commit 5884cdc

Please sign in to comment.