Skip to content

Commit 00680b2

Browse files
authored
Merge pull request #107 from Devminjeong-eum/fix/DEV-162
[DEV-162] 단어장 페이지 QA 사항 반영
2 parents 6794c65 + 1d1e2bd commit 00680b2

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

src/components/pages/wordbook/QuizBanner.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ export default function QuizBanner() {
77
href={QUIZ_PATH}
88
className="w-10/12 h-24 rounded-2xl bg-[#242C4B] flex gap-6 items-center justify-center"
99
>
10-
<div className="flex flex-col gap-2">
11-
<span className="text-white opacity-70 font-medium text-sm">
10+
<div className="flex flex-col gap-2 h-full">
11+
<span className="text-white opacity-70 font-medium text-sm flex items-end h-full">
1212
퀴즈 풀고 내 점수 알아보자!
1313
</span>
14-
<span className="text-white font-semibold text-lg">
14+
<span className="text-white font-semibold text-lg flex items-start h-full">
1515
나의 개발 용어 발음 실력은?
1616
</span>
1717
</div>

src/components/pages/wordbook/index.tsx

+15-13
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ export default function Wordbook() {
2727
const { data: wordData, totalCount } = data.data.data;
2828

2929
return (
30-
<div>
30+
<div className="bg-[#FBFCFE]">
3131
<div className="bg-wordbook-gradient h-32">
3232
<WordbookHeader />
3333
</div>
34-
<div className="flex flex-col justify-between">
35-
<div className="relative bottom-16 flex flex-col">
34+
<div className="flex flex-col justify-between mt-[-4rem]">
35+
<div className="flex flex-col">
3636
<div className="flex">
3737
<div className="w-[calc(46%+30px)] h-9 overflow-hidden rounded-tl-xl relative top-px">
3838
<div className="bg-[#FBFCFE] [transform:rotateY(180deg)_skew(-30deg)_translate(30px,0px)] h-full rounded-tl-md flex justify-center items-center">
39-
<div className="[transform:rotateY(180deg)_skew(-30deg)_translate(-40px,0px)] pl-2.5 text-[#313140] font-medium text-[15px] leading-[18px] tracking-[-0.02em] opacity-90">
39+
<div className="[transform:rotateY(180deg)_skew(-30deg)_translate(-40px,0px)] pl-2.5 pt-0.5 text-[#313140] font-medium text-[15px] leading-[18px] tracking-[-0.02em] opacity-90">
4040
{totalCount}
4141
</div>
4242
</div>
@@ -47,7 +47,7 @@ export default function Wordbook() {
4747
/>
4848
</div>
4949
{totalCount === 0 ? (
50-
<div className="bg-[#FBFCFE] h-[calc(100vh-23rem)] flex flex-col justify-center items-center gap-2.5">
50+
<div className="bg-[#FBFCFE] flex flex-col items-center gap-2.5 pt-[8.438rem] pb-[8.125rem]">
5151
<NoWordSvg />
5252
<span className="text-[#A8AEBC] font-medium text-center tracking-[-0.02em]">
5353
좋아요를 누른 단어가 없어요.
@@ -72,7 +72,7 @@ export default function Wordbook() {
7272
</div>
7373
)}
7474
</div>
75-
<div className="flex flex-col items-center gap-8 relative top-[-2rem]">
75+
<div className="flex flex-col items-center gap-5 bg-[#FBFCFE] pb-7">
7676
{totalCount === 0 ? (
7777
<Link
7878
href={WORD_LIST_PATH}
@@ -81,13 +81,15 @@ export default function Wordbook() {
8181
<p className="text-[#383697] font-semibold">단어 검색하러 가기</p>
8282
</Link>
8383
) : (
84-
<Pagination
85-
viewPaginationNums={4}
86-
total={totalCount || 0}
87-
limit={10}
88-
setCurrent={setCurrentPage}
89-
current={currentPage}
90-
/>
84+
<div className="flex items-center justify-center w-10/12 h-14">
85+
<Pagination
86+
viewPaginationNums={4}
87+
total={totalCount || 0}
88+
limit={10}
89+
setCurrent={setCurrentPage}
90+
current={currentPage}
91+
/>
92+
</div>
9193
)}
9294
<QuizBanner />
9395
</div>

0 commit comments

Comments
 (0)