Skip to content

Commit b32d5ab

Browse files
authored
Merge pull request #90 from ASAP-Lettering/hotfix/#86
[Design] 편지 날짜 보일 때의 font-size 조절
2 parents fc6c3c1 + da2f007 commit b32d5ab

3 files changed

Lines changed: 20 additions & 21 deletions

File tree

src/app/verify/letter/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const VerifyLetter = () => {
8080

8181
// letterCode가 있을 경우 추가 검증 진행
8282
if (url) {
83-
verifyLetter(url)
83+
await verifyLetter(url)
8484
.then((res) => {
8585
if (res.data.letterId) {
8686
setletterId(res.data.letterId);

src/components/common/Check.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ const CheckContainer = styled.label<{ $checkType: checkType }>`
8181
const CheckInput = styled.input<{ $checkType: checkType; $label: boolean }>`
8282
appearance: none;
8383
flex-shrink: 0;
84-
width: ${({ $checkType }) => ($checkType ? "24px" : "32px")};
85-
height: ${({ $checkType }) => ($checkType ? "24px" : "32px")};
84+
width: ${({ $checkType }) => ($checkType !== "large" ? "24px" : "32px")};
85+
height: ${({ $checkType }) => ($checkType !== "large" ? "24px" : "32px")};
8686
margin-right: ${({ $label }) => ($label ? "17px" : "0px")};
8787
border-radius: 4px;
8888
background-color: ${(props) =>
@@ -92,12 +92,13 @@ const CheckInput = styled.input<{ $checkType: checkType; $label: boolean }>`
9292
: theme.colors.gray500
9393
: "transparent"};
9494
position: relative;
95+
display: flex;
9596
`;
9697

9798
const StyledImage = styled(Image)<{ $checkType: checkType }>`
9899
position: absolute;
99-
top: ${({ $checkType }) => ($checkType ? "2px" : "6px")};
100-
left: ${({ $checkType }) => ($checkType ? "2px" : "6px")};
100+
top: ${({ $checkType }) => ($checkType !== "large" ? "2px" : "6px")};
101+
left: ${({ $checkType }) => ($checkType !== "large" ? "2px" : "6px")};
101102
pointer-events: none;
102103
z-index: 10;
103104
`;

src/components/common/Tag.tsx

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,36 +377,34 @@ const Box = styled.div<{
377377
background: ${theme.colors.gray800};
378378
${(props) => props.theme.fonts.body08};
379379
display: flex;
380-
${
381-
$hasEditIcon &&
382-
css`
380+
${$hasEditIcon &&
381+
css`
383382
height: 47px;
384383
padding: 9px 18px;
385384
border-radius: 200px;
386385
background: rgba(255, 255, 255, 0.2);
387386
backdrop-filter: blur(2px);
388387
${(props) => props.theme.fonts.title01};
389388
gap: 4px;
390-
`
391-
}
392-
${
393-
$hasName === false &&
394-
css`
389+
`}
390+
${$hasName === false &&
391+
css`
395392
padding: 7.5px 13px 7.5px 13px;
396-
`
397-
}
393+
`}
398394
`}
399395
400396
${({ $tagType, $orbitType }) =>
401-
$tagType === "letter" &&
402-
css`
397+
$tagType === "letter" &&
398+
css`
403399
display: block;
404400
max-width: 90px;
405-
padding: ${$orbitType === "2" ? "10px" : "11px 15px"};
406-
border-radius: 100px;
401+
padding: ${$orbitType === "2" ? "7.5px 15px" : "11px 15px"};
402+
border-radius: 40px;
407403
background: ${theme.colors.sub01};
408-
${(props) => props.theme.fonts.body07};
404+
${(props) =>
405+
$orbitType === "2" ? props.theme.fonts.body8 : props.theme.fonts.body6};
409406
line-height: 16px;
407+
font-size: ${$orbitType === "2" && "14px"};
410408
white-space: nowrap;
411409
overflow: hidden;
412410
text-overflow: ellipsis;
@@ -449,7 +447,7 @@ const Name = styled.span`
449447

450448
const Date = styled.span`
451449
color: ${theme.colors.gray300};
452-
${(props) => props.theme.fonts.caption03};
450+
${(props) => props.theme.fonts.caption05};
453451
-webkit-user-select: none;
454452
-moz-user-select: none;
455453
-ms-use-select: none;

0 commit comments

Comments
 (0)