Skip to content

Commit

Permalink
Merge pull request #368 from TEAM-BEAT/feat/#367/MakerUI
Browse files Browse the repository at this point in the history
[Feat/#367] maker UI 변경
  • Loading branch information
imddoy authored Aug 29, 2024
2 parents 7dcfb54 + 5b116f3 commit f546977
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/pages/gig/components/peopleCard/PeopleCard.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const PeopleCardContainer = styled.article`

export const PeopleCardPhoto = styled.img`
width: 15.7rem;
height: calc(15.7rem * 4 / 3);
height: 15.7rem;
margin-bottom: 0.7rem;
object-fit: cover;
object-position: center;
Expand Down
5 changes: 3 additions & 2 deletions src/pages/register/Register.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const Divider = styled.div`
`;

export const FooterContainer = styled.div`
position: relative;
padding: 2.4rem;
background-color: ${({ theme }) => theme.colors.gray_900};
Expand Down Expand Up @@ -234,7 +235,7 @@ export const RoleAddBtn = styled.section`
${Generators.flexGenerator()}
flex-shrink: 0;
width: 13.6rem;
height: 26.6rem;
height: 24.4rem;
background: ${({ theme }) => theme.colors.gray_900};
border: 1px dashed ${({ theme }) => theme.colors.gray_700};
Expand All @@ -243,7 +244,7 @@ export const RoleAddBtn = styled.section`

export const RoleWrapper = styled.div`
${Generators.flexGenerator("column", "center", "center")}
height: 26.6rem;
height: 24.4rem;
`;

export const FooterInfo = styled.div`
Expand Down
4 changes: 4 additions & 0 deletions src/pages/register/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ const Register = () => {
setRegisterStep((prev) => prev + 1);
};

useEffect(() => {
window.scrollTo({ top: 0 });
}, [registerStep]);

const { setHeader } = useHeader();

// 티켓 수량이 동일하게 적용
Expand Down
2 changes: 1 addition & 1 deletion src/pages/register/components/RoleLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const RoleLayout = ({ list, updateList, title }: RoleLayoutProps) => {
}, [makerList]);

return (
<S.InputRegisterBox $marginBottom={2.8}>
<S.InputRegisterBox $marginBottom={5.6}>
<S.InputTitle>{title}</S.InputTitle>
<Spacing marginBottom="1.4" />
<S.RoleListWrapper>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/register/components/RoleWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ const RoleWrapper = ({ id, role, removeRole, onUpdateRole }: RoleWrapperProps) =
<S.RoleWrapper>
<S.FileInputWrapper>
{previewImg ? (
<S.PreviewImageWrapper width={13.6} height={15.8}>
<S.PreviewImage src={previewImg} alt="Preview" width={13.6} height={15.8} />
<S.PreviewImageWrapper width={13.6} height={13.6}>
<S.PreviewImage src={previewImg} alt="Preview" width={13.6} height={13.6} />
<S.RemoveImageButton onClick={() => removeRole(id)} />
</S.PreviewImageWrapper>
) : (
<>
<S.HiddenFileInput type="file" id={`file-${id}`} onChange={uploadFile} />
<S.CustomFileInput htmlFor={`file-${id}`} width={13.6} height={15.8}>
<S.CustomFileInput htmlFor={`file-${id}`} width={13.6} height={13.6}>
<IconCamera width={"3.2rem"} />
<S.RemoveImageButton onClick={() => removeRole(id)} />
</S.CustomFileInput>
Expand Down

0 comments on commit f546977

Please sign in to comment.