Skip to content

Commit

Permalink
Merge pull request #201 from Team-Lecue/Hotfix-Rooming
Browse files Browse the repository at this point in the history
Merge Hotfix rooming into dev
  • Loading branch information
Arooming authored Jan 19, 2024
2 parents 8291842 + 7a317e3 commit 5ace06f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/CreateBook/components/CompleteButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function CompleteButton({
return (
<S.CompleteButtonWrapper>
<Button variant="complete" disabled={!isActive} onClick={onClick} backgroundColor={backgroundColor}>
완료
제작 완료
</Button>
</S.CompleteButtonWrapper>
);
Expand Down
2 changes: 1 addition & 1 deletion src/CreateBook/page/CreateBook.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const CreateBookBodyWrapper = styled.div`
flex-direction: column;
width: 100%;
height: calc(100vh - 5.4rem);
height: calc(100dvh - 5.4rem);
padding: 0 1.6rem;
margin-top: 5.4rem;
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const SmallLecueNoteWrapper = styled.div<{
return `background: url(${noteBackground})`;
}
}};
background-size: cover;
background-size: 15.2rem 16.6rem;
color: ${({ noteTextColor }) => {
return noteTextColor;
}};
Expand Down
9 changes: 5 additions & 4 deletions src/Home/components/LecueBookList/LecueBookList.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const LecueBookListWrapper = styled.div`
flex-direction: column;
width: 100%;
height: 100dvh;
background-color: ${({ theme }) => theme.colors.key};
`;

Expand All @@ -16,10 +16,10 @@ export const Title = styled.header`
border-color: ${({ theme }) => theme.colors.BG};
border-width: 0.1rem 0;
border-style: solid;
background-color: ${({ theme }) => theme.colors.white};
color: ${({ theme }) => theme.colors.BG};
${({ theme }) => theme.fonts.Title1_SB_16};
background-color: ${({ theme }) => theme.colors.white};
text-align: center;
`;

Expand All @@ -29,15 +29,14 @@ export const LecueBookList = styled.section`
grid-template-columns: repeat(3, 1fr);
width: 100%;
padding: 3rem 1.6rem 2.2rem;
`;

export const LecueBook = styled.li`
display: flex;
gap: 1rem;
align-items: center;
justify-content: center;
align-items: center;
flex-direction: column;
width: 100%;
Expand All @@ -51,6 +50,8 @@ export const BookImage = styled.img`
height: 9.8rem;
border-radius: 50%;
object-fit: cover;
`;

export const BookTitle = styled.p`
Expand Down
4 changes: 2 additions & 2 deletions src/Splash/component/Body/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as S from './Body.style';

function Body() {
const { data } = useGetNoteNum();

return (
<S.BodyWrapper>
<S.LottieWrapper>
Expand All @@ -15,7 +15,7 @@ function Body() {

<S.TextWrapper>
<S.Text>지금까지 {data && data.data.noteNum}개의</S.Text>
<S.Text>포스트잇이 붙여졌어요!</S.Text>
<S.Text>레큐노트가 남겨졌어요!</S.Text>
</S.TextWrapper>
</S.BodyWrapper>
);
Expand Down

0 comments on commit 5ace06f

Please sign in to comment.