Skip to content

Commit 0be8137

Browse files
committed
refactor: 스크롤 페이지 버튼 수정
1 parent e151570 commit 0be8137

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

src/components/ReceiptEdit/ReceiptEdit.module.scss

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,25 @@
5555
}
5656

5757
.Bottom {
58+
z-index: 2;
59+
position: fixed;
5860
display: flex;
5961
align-items: center;
62+
justify-content: center;
63+
width: 100%;
64+
height: 7rem;
65+
left: 0;
66+
bottom: 0;
6067
gap: 0.875rem;
61-
z-index: 1;
62-
margin-top: 2.5rem;
68+
background: linear-gradient(
69+
180deg,
70+
rgba(220, 220, 232, 0) 0%,
71+
rgba(220, 220, 232, 1) 20%,
72+
rgba(220, 220, 232, 1) 100%
73+
);
74+
75+
& > button {
76+
margin-top: 1.25rem;
77+
width: calc(50% - 1.25rem);
78+
}
6379
}

src/components/ui/Button/Button.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
&.style-tertiary {
1717
background-color: var(--color-gray200);
18-
color: var(--color-text-secondary);
18+
color: var(--color-text-tertiary);
1919
}
2020

2121
&:disabled {
22-
background-color: var(--color-gray350);
22+
background-color: var(--color-disabled);
2323
color: var(--color-text-tertiary);
2424
cursor: not-allowed;
2525
}

src/pages/ReceiptInputPage/ReceiptInputPage.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ const ReceiptInputPage = () => {
8282
<Text variant="titleM" color="primary" align="center" as="h1">
8383
{formData.find((item) => item.key === "place")?.value
8484
? `${formData.find((item) => item.key === "place")?.value}에`
85-
: "영수증 정보를"}
85+
: "가게명과 메뉴명을"}
8686
</Text>
8787
<Text variant="titleM" color="primary" as="h1" align="center">
88-
{formData.find((item) => item.key === "place")?.value
89-
? "다녀오셨네요!"
90-
: "입력해주세요!"}
88+
{formData.find((item) => item.key === "place")?.value ? "다녀오셨네요!" : "알려주세요!"}
9189
</Text>
9290

9391
<div className={styles.InfoList}>
@@ -110,7 +108,7 @@ const ReceiptInputPage = () => {
110108

111109
<div className={styles.Bottom}>
112110
{Object.values(focusState).some((isFocus) => isFocus) ? (
113-
<Button key="edit" text="수정하기" />
111+
<Button key="edit" text="다음" />
114112
) : (
115113
<Button
116114
key="confirm"

src/styles/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
--color-text-secondary: #68696e;
1919
--color-text-tertiary: #a6a6ad;
2020
--color-text-quarternary: #e0e0e0;
21+
--color-disabled: #ebecf0;
2122
--color-text-gradient: linear-gradient(
2223
90deg,
2324
var(--color-primary-pink),
@@ -35,7 +36,6 @@
3536
--color-gray100: #f8f8f8;
3637
--color-gray200: #ebecf0;
3738
--color-gray300: #e1e2e8;
38-
--color-gray350: #dcdde3;
3939
--color-gray400: #00000026;
4040
--color-gray500: #00000040;
4141
--color-gray600: #363642;

0 commit comments

Comments
 (0)