From d7e243c029d853d4ac8103da36e168a9aee9c882 Mon Sep 17 00:00:00 2001
From: soyeong <mb535622@sookmyung.ac.kr>
Date: Mon, 3 Aug 2026 22:44:21 +0900
Subject: [PATCH 1/6] =?UTF-8?q?style:=20=EC=84=9C=EB=B9=84=EC=8A=A4=20?=
 =?UTF-8?q?=EC=A0=84=EB=B0=98=20=EC=9B=8C=EB=94=A9=20=ED=86=B5=EC=9D=BC=20?=
 =?UTF-8?q?(=EC=9C=84=EC=8B=9C=ED=85=9C=E2=86=92=EC=9C=84=EC=8B=9C,=20?=
 =?UTF-8?q?=EC=B4=88=EB=8C=80=E2=86=92=EA=B3=B5=EC=9C=A0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/archive/wish/[id]/_components/EditContent.tsx | 2 +-
 .../src/app/archive/wish/_components/WishGridContent.tsx  | 2 +-
 .../src/app/home/_components/CreateTournamentDialog.tsx   | 5 ++---
 .../src/app/home/_components/InviteTournamentDialog.tsx   | 8 ++++----
 .../src/app/home/_components/tournament-list/index.tsx    | 2 +-
 apps/web/src/app/mypage/withdraw/page.tsx                 | 2 +-
 .../[id]/item/[itemId]/_components/EditContent.tsx        | 2 +-
 .../join/[id]/_components/JoinPreviewClient.tsx           | 2 +-
 .../components/common/create-tournament-dialog/index.tsx  | 6 +++---
 apps/web/src/components/get-item-dialog/index.tsx         | 2 +-
 apps/web/src/components/input/index.tsx                   | 2 +-
 11 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/apps/web/src/app/archive/wish/[id]/_components/EditContent.tsx b/apps/web/src/app/archive/wish/[id]/_components/EditContent.tsx
index 4f0ab455..f86b5840 100644
--- a/apps/web/src/app/archive/wish/[id]/_components/EditContent.tsx
+++ b/apps/web/src/app/archive/wish/[id]/_components/EditContent.tsx
@@ -17,7 +17,7 @@ function EditContent({ wishId }: EditContentProps) {
     <div className="hide-scrollbar min-h-dvh overflow-y-auto bg-bg-layer-basement px-5 pt-padding-top pb-[78px]">
       <Header
         left={<HeaderIcon name="BACK" />}
-        center="위시템 정보 확인"
+        center="위시 정보 확인"
         centerClassName="heading-1-bold"
       />
       <main>
diff --git a/apps/web/src/app/archive/wish/_components/WishGridContent.tsx b/apps/web/src/app/archive/wish/_components/WishGridContent.tsx
index 1a3b22de..f89bc044 100644
--- a/apps/web/src/app/archive/wish/_components/WishGridContent.tsx
+++ b/apps/web/src/app/archive/wish/_components/WishGridContent.tsx
@@ -20,7 +20,7 @@ function WishGridContent({
     return (
       <div className="flex flex-1 flex-col items-center justify-center gap-3">
         <HeartIconFill width={32} height={32} className="text-gray-200" />
-        <p className="body-1-semibold text-text-neutral-tertiary">아직 담긴 위시템이 없어요</p>
+        <p className="body-1-semibold text-text-neutral-tertiary">아직 담긴 위시가 없어요</p>
       </div>
     );
   }
diff --git a/apps/web/src/app/home/_components/CreateTournamentDialog.tsx b/apps/web/src/app/home/_components/CreateTournamentDialog.tsx
index b98222de..c5f38daf 100644
--- a/apps/web/src/app/home/_components/CreateTournamentDialog.tsx
+++ b/apps/web/src/app/home/_components/CreateTournamentDialog.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 
-import { BasketIconFill, EditIconFill } from '@/assets/icons';
+import { BasketIconFill } from '@/assets/icons';
 import Button from '@/components/button';
 import {
   Dialog,
@@ -61,12 +61,11 @@ function CreateTournamentDialog() {
         <form onSubmit={handleCreate} className="flex flex-col gap-[15px]">
           <Input
             label="토너먼트 이름"
-            placeholder="ex.이번주 신발 고르기"
+            placeholder="이번주 신발 고르기"
             value={name}
             onChange={e => setName(e.target.value)}
             autoFocus
             maxLength={30}
-            right={isDisabled ? <EditIconFill className="size-5" /> : null}
           />
           <Button type="submit" size="lg" variant="primary" disabled={isDisabled}>
             생성하기
diff --git a/apps/web/src/app/home/_components/InviteTournamentDialog.tsx b/apps/web/src/app/home/_components/InviteTournamentDialog.tsx
index d43998f0..15306344 100644
--- a/apps/web/src/app/home/_components/InviteTournamentDialog.tsx
+++ b/apps/web/src/app/home/_components/InviteTournamentDialog.tsx
@@ -98,25 +98,25 @@ function InviteTournamentDialog() {
         <DialogTrigger asChild onClick={handleTriggerClick}>
           <button
             type="button"
-            aria-label="초대받은 토너먼트 참여하기"
+            aria-label="공유받은 토너먼트 참여하기"
             className="flex h-[104px] cursor-pointer flex-col rounded-2xl bg-gray-50 p-4"
           >
             <span className="text-left body-1-semibold whitespace-pre-line text-text-neutral-primary">
-              {'초대받은 토너먼트\n참여하기'}
+              {'공유받은 토너먼트\n참여하기'}
             </span>
             <GroupIconFill className="size-7.5 self-end text-icon-neutral-secondary" />
           </button>
         </DialogTrigger>
         <DialogContent showCloseButton={false} className="flex flex-col gap-5 p-6">
           <DialogTitle className="text-center heading-1-bold text-text-neutral-primary">
-            초대받은 토너먼트
+            공유받은 토너먼트
           </DialogTitle>
           <DialogDescription className="sr-only">초대 코드를 입력해 입장합니다.</DialogDescription>
 
           <form onSubmit={handleSubmit} className="flex flex-col gap-5">
             <Input
               label="초대 코드"
-              placeholder="ex. ABC123"
+              placeholder="pik123"
               value={code}
               onChange={event => handleChange(event.target.value)}
               aria-invalid={showFormatError}
diff --git a/apps/web/src/app/home/_components/tournament-list/index.tsx b/apps/web/src/app/home/_components/tournament-list/index.tsx
index 294e57a1..a8afbd0e 100644
--- a/apps/web/src/app/home/_components/tournament-list/index.tsx
+++ b/apps/web/src/app/home/_components/tournament-list/index.tsx
@@ -25,7 +25,7 @@ function TournamentList() {
     <HydrationBoundary state={dehydrate(queryClient)}>
       <section className="flex flex-1 flex-col gap-3">
         <div className="flex items-center justify-between">
-          <h2 className="heading-2-semibold text-black">최근 생성한 토너먼트</h2>
+          <h2 className="heading-2-semibold text-black">최근 토너먼트</h2>
           <Link href={ROUTES.TOURNAMENT_HISTORY} aria-label="토너먼트 히스토리 보기">
             <ChevronForwardIconFill className="size-6 text-icon-neutral-secondary" aria-hidden />
           </Link>
diff --git a/apps/web/src/app/mypage/withdraw/page.tsx b/apps/web/src/app/mypage/withdraw/page.tsx
index 31749684..903b4fbd 100644
--- a/apps/web/src/app/mypage/withdraw/page.tsx
+++ b/apps/web/src/app/mypage/withdraw/page.tsx
@@ -22,7 +22,7 @@ function MypageWithdrawPage() {
           <SadIconFill className="size-[74px] text-gray-100" aria-hidden />
           <WithdrawGreeting />
           <p className="text-center body-2-medium break-keep text-text-neutral-tertiary">
-            지금까지의 토너먼트 기록, 위시템 기록이 전부 사라져요.
+            지금까지의 토너먼트 기록, 위시 기록이 전부 사라져요.
           </p>
         </div>
 
diff --git a/apps/web/src/app/tournament/[id]/item/[itemId]/_components/EditContent.tsx b/apps/web/src/app/tournament/[id]/item/[itemId]/_components/EditContent.tsx
index 77984d3f..166b5f29 100644
--- a/apps/web/src/app/tournament/[id]/item/[itemId]/_components/EditContent.tsx
+++ b/apps/web/src/app/tournament/[id]/item/[itemId]/_components/EditContent.tsx
@@ -23,7 +23,7 @@ function EditContent({ tournamentId, tournamentItemId }: EditContentProps) {
     >
       <Header
         left={<HeaderIcon name="BACK" />}
-        center="위시템 정보 확인"
+        center="위시 정보 확인"
         centerClassName="heading-1-bold"
       />
       <main>
diff --git a/apps/web/src/app/tournament/join/[id]/_components/JoinPreviewClient.tsx b/apps/web/src/app/tournament/join/[id]/_components/JoinPreviewClient.tsx
index a8084619..02b5989c 100644
--- a/apps/web/src/app/tournament/join/[id]/_components/JoinPreviewClient.tsx
+++ b/apps/web/src/app/tournament/join/[id]/_components/JoinPreviewClient.tsx
@@ -181,7 +181,7 @@ function JoinPreviewClient({ tournamentId, inviteCode }: JoinPreviewClientProps)
         />
 
         <section className="mt-8.75 flex flex-col gap-2 px-5">
-          <p className="body-2-semibold text-text-neutral-primary">초대받은 토너먼트</p>
+          <p className="body-2-semibold text-text-neutral-primary">공유받은 토너먼트</p>
           <div className="flex flex-col gap-1 rounded-xl bg-gray-50 p-4">
             <p className="body-1-semibold text-text-neutral-primary">
               {invitePreviewData.tournamentName}
diff --git a/apps/web/src/components/common/create-tournament-dialog/index.tsx b/apps/web/src/components/common/create-tournament-dialog/index.tsx
index 9a347c25..d004f2a0 100644
--- a/apps/web/src/components/common/create-tournament-dialog/index.tsx
+++ b/apps/web/src/components/common/create-tournament-dialog/index.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 
-import { EditIconFill } from '@/assets/icons';
+
 import Button from '@/components/button';
 import { DialogContent, DialogDescription, DialogTitle } from '@/components/dialog';
 import Input from '@/components/input';
@@ -36,12 +36,12 @@ function CreateTournamentDialogContent() {
       <form onSubmit={handleCreate} className="flex flex-col gap-[15px]">
         <Input
           label="토너먼트 이름"
-          placeholder="ex.이번주 신발 고르기"
+          placeholder="이번주 신발 고르기"
           value={name}
           onChange={e => setName(e.target.value)}
           autoFocus
           maxLength={30}
-          right={isDisabled ? <EditIconFill className="size-5" /> : null}
+
         />
         <Button type="submit" size="lg" variant="primary" disabled={isDisabled}>
           생성하기
diff --git a/apps/web/src/components/get-item-dialog/index.tsx b/apps/web/src/components/get-item-dialog/index.tsx
index 5dc2fc90..7f024a86 100644
--- a/apps/web/src/components/get-item-dialog/index.tsx
+++ b/apps/web/src/components/get-item-dialog/index.tsx
@@ -31,7 +31,7 @@ function GetItemDialogContent({ type }: GetItemDialogContentProps) {
     <>
       <DialogContent showCloseButton={false} className="flex flex-col gap-[15px]">
         <DialogTitle className="text-center heading-1-bold text-text-neutral-primary">
-          위시템 담기
+          위시 담기
         </DialogTitle>
         <DialogDescription className="sr-only">
           위시, 링크, 이미지 중 하나를 선택해 상품을 담습니다.
diff --git a/apps/web/src/components/input/index.tsx b/apps/web/src/components/input/index.tsx
index e3443c50..2a1f82ec 100644
--- a/apps/web/src/components/input/index.tsx
+++ b/apps/web/src/components/input/index.tsx
@@ -48,7 +48,7 @@ function Input({
           aria-invalid={ariaInvalid}
           {...(helperText ? { 'aria-describedby': helperTextId } : {})}
           className={cn(
-            'w-full overflow-hidden bg-transparent body-1-medium text-ellipsis whitespace-nowrap text-gray-600 outline-none placeholder:text-gray-300 focus:text-gray-900 disabled:text-gray-300',
+            'w-full overflow-hidden bg-transparent body-1-medium text-ellipsis whitespace-nowrap text-gray-600 outline-none placeholder:text-text-neutral-tertiary focus:text-gray-900 disabled:text-gray-300',
             className
           )}
           {...props}

From 41c9efbfe134405376514212aa44f8cd1c4b9375 Mon Sep 17 00:00:00 2001
From: soyeong <mb535622@sookmyung.ac.kr>
Date: Mon, 3 Aug 2026 22:51:14 +0900
Subject: [PATCH 2/6] =?UTF-8?q?test:=20=ED=99=88=20=ED=86=A0=EB=84=88?=
 =?UTF-8?q?=EB=A8=BC=ED=8A=B8=20=EB=AA=A9=EB=A1=9D=20=ED=97=A4=EB=94=A9=20?=
 =?UTF-8?q?=EC=9B=8C=EB=94=A9=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=A7=9E?=
 =?UTF-8?q?=EA=B2=8C=20E2E=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/e2e/specs/home/home.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/e2e/specs/home/home.spec.ts b/apps/web/e2e/specs/home/home.spec.ts
index 8b7d716e..44b74b46 100644
--- a/apps/web/e2e/specs/home/home.spec.ts
+++ b/apps/web/e2e/specs/home/home.spec.ts
@@ -10,7 +10,7 @@ test('홈에 진입하면 최근 생성한 토너먼트 목록이 렌더링된
 
   await page.goto('/home');
 
-  await expect(page.getByRole('heading', { name: '최근 생성한 토너먼트' })).toBeVisible();
+  await expect(page.getByRole('heading', { name: '최근 토너먼트' })).toBeVisible();
   await expect(page.getByText('E2E 토너먼트')).toBeVisible();
 });
 

From d29d317617c4f3a2282cc2003353e871f4ff30b3 Mon Sep 17 00:00:00 2001
From: soyeong <mb535622@sookmyung.ac.kr>
Date: Mon, 3 Aug 2026 23:52:50 +0900
Subject: [PATCH 3/6] =?UTF-8?q?style:=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=95=98=EB=8B=A8=20offset=2052px=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/components/toast/index.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/components/toast/index.tsx b/apps/web/src/components/toast/index.tsx
index da6b2d95..1dbfca60 100644
--- a/apps/web/src/components/toast/index.tsx
+++ b/apps/web/src/components/toast/index.tsx
@@ -5,12 +5,10 @@ import { Toaster as Sonner, type ToasterProps } from 'sonner';
 import { AlertIconFill, CheckCircledIconFill, WarningIconFill } from '@/assets/icons/fill';
 
 /**
- * 토스트 하단 offset 기본값 (하단 in-flow 버튼 영역 ~88px 기준).
- * sonner의 `offset` prop은 데스크탑/모바일 둘 다 동일하게 적용되어,
- * `mobileOffset`과 별개로 컨테이너 기본 위치를 제어한다.
+ * 토스트 하단 offset 기본값.
  * Bottom Tab Bar 가 있는 페이지는 globals.css 의 `:has([data-bottom-tab-bar])` 규칙이 덮어쓴다.
  */
-const TOAST_OFFSET = '95px';
+const TOAST_OFFSET = '52px';
 
 const Toaster = ({ ...props }: ToasterProps) => {
   return (

From d16338d4adde2d81e7d95d044eb3746971f29891 Mon Sep 17 00:00:00 2001
From: soyeong <mb535622@sookmyung.ac.kr>
Date: Mon, 3 Aug 2026 23:53:00 +0900
Subject: [PATCH 4/6] =?UTF-8?q?style:=20404=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/not-found.tsx                | 30 +++++++++----------
 .../src/assets/images/basket-not-found.svg    | 15 ++++++++++
 2 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 apps/web/src/assets/images/basket-not-found.svg

diff --git a/apps/web/src/app/not-found.tsx b/apps/web/src/app/not-found.tsx
index 25fa51f0..a8afe0d2 100644
--- a/apps/web/src/app/not-found.tsx
+++ b/apps/web/src/app/not-found.tsx
@@ -1,26 +1,26 @@
 import Link from 'next/link';
 
-import { CloseCircularIconFill } from '@/assets/icons';
+import BasketNotFoundIcon from '@/assets/images/basket-not-found.svg';
+import { buttonStyles } from '@/components/button/button.style';
 import { ROUTES } from '@/consts/route';
 
 function NotFound() {
   return (
-    <div className="flex h-full flex-col items-center gap-6 bg-bg-layer-basement pt-40">
-      <div className="flex flex-col items-center gap-4">
-        <CloseCircularIconFill className="size-20 text-icon-neutral-secondary" />
-        <div className="flex flex-col items-center gap-2">
-          <h1 className="heading-1-bold text-text-neutral-secondary">페이지를 찾을 수 없어요.</h1>
-          <p className="body-1-semibold text-text-neutral-tertiary">
-            링크가 잘못되었거나 삭제된 페이지예요.
-          </p>
+    <div className="h-full bg-bg-layer-basement pt-padding-top">
+      <div className="flex flex-col items-center gap-[30px] pt-[calc(253px-env(safe-area-inset-top))]">
+        <div className="flex flex-col items-center gap-[25px]">
+          <BasketNotFoundIcon className="size-15" aria-hidden />
+          <div className="flex flex-col items-center gap-2">
+            <h1 className="heading-1-semibold text-text-neutral-primary">페이지를 찾을 수 없어요</h1>
+            <p className="body-1-medium text-text-neutral-tertiary">
+              링크가 잘못되었거나 삭제된 페이지예요
+            </p>
+          </div>
         </div>
+        <Link href={ROUTES.HOME} className={buttonStyles({ variant: 'primary', size: 'md' })}>
+          홈으로 가기
+        </Link>
       </div>
-      <Link
-        href={ROUTES.HOME}
-        className="inline-flex items-center justify-center rounded-xl border-[1.2px] border-gray-200 bg-bg-layer-floating px-4.5 py-2.5 body-1-semibold text-text-neutral-primary"
-      >
-        홈으로 가기
-      </Link>
     </div>
   );
 }
diff --git a/apps/web/src/assets/images/basket-not-found.svg b/apps/web/src/assets/images/basket-not-found.svg
new file mode 100644
index 00000000..5889c948
--- /dev/null
+++ b/apps/web/src/assets/images/basket-not-found.svg
@@ -0,0 +1,15 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6972 6.76799L13.965 17.5002H7.88328C6.36191 17.5002 5.19325 18.8477 5.40841 20.3538L9.08085 46.0609C9.60869 49.7557 12.7731 52.5002 16.5055 52.5002H43.496C47.2284 52.5002 50.3928 49.7557 50.9207 46.0609L54.5931 20.3538C54.8083 18.8477 53.6396 17.5002 52.1182 17.5002H46.036L35.3038 6.76799C32.3749 3.83905 27.6261 3.83906 24.6972 6.76799ZM31.7683 10.3035C30.792 9.32721 29.209 9.32721 28.2327 10.3035L21.036 17.5002L38.965 17.5002L31.7683 10.3035ZM22.5007 30.0002C22.5007 28.6195 21.3814 27.5002 20.0007 27.5002C18.62 27.5002 17.5007 28.6195 17.5007 30.0002V40.0002C17.5007 41.3809 18.62 42.5002 20.0007 42.5002C21.3814 42.5002 22.5007 41.3809 22.5007 40.0002V30.0002ZM30.0007 27.5002C31.3814 27.5002 32.5007 28.6195 32.5007 30.0002V40.0002C32.5007 41.3809 31.3814 42.5002 30.0007 42.5002C28.62 42.5002 27.5007 41.3809 27.5007 40.0002V30.0002C27.5007 28.6195 28.62 27.5002 30.0007 27.5002ZM42.5007 30.0002C42.5007 28.6195 41.3814 27.5002 40.0007 27.5002C38.62 27.5002 37.5007 28.6195 37.5007 30.0002V40.0002C37.5007 41.3809 38.62 42.5002 40.0007 42.5002C41.3814 42.5002 42.5007 41.3809 42.5007 40.0002V30.0002Z" fill="#4DC1FF"/>
+<rect x="15.7812" y="27.4805" width="28.668" height="16.1621" fill="#4DC1FF"/>
+<path d="M26.3122 31.8706C27.5245 31.8706 28.5073 30.8878 28.5073 29.6755C28.5073 28.4632 27.5245 27.4805 26.3122 27.4805C25.0999 27.4805 24.1172 28.4632 24.1172 29.6755C24.1172 30.8878 25.0999 31.8706 26.3122 31.8706Z" fill="white"/>
+<path d="M33.3786 31.8706C34.5909 31.8706 35.5737 30.8878 35.5737 29.6755C35.5737 28.4632 34.5909 27.4805 33.3786 27.4805C32.1664 27.4805 31.1836 28.4632 31.1836 29.6755C31.1836 30.8878 32.1664 31.8706 33.3786 31.8706Z" fill="white"/>
+<g clip-path="url(#clip0_1924_15352)">
+<path d="M48.1113 28.5424C48.1113 25.4311 45.2529 22.2168 45.2529 22.2168C45.2529 22.2168 44.5663 24.1368 43.6029 26.2016C42.8732 27.7655 42.132 29.6569 43.2317 30.9869C43.7678 31.6353 44.4948 31.9995 45.2529 31.9995C46.011 31.9995 46.7381 31.6353 47.2741 30.9869C47.8102 30.3386 48.1113 29.4593 48.1113 28.5424Z" fill="white"/>
+</g>
+<rect x="27.6211" y="37.0293" width="4.75781" height="6.61292" rx="1" fill="white"/>
+<defs>
+<clipPath id="clip0_1924_15352">
+<rect width="10" height="10" fill="white" transform="translate(41 22)"/>
+</clipPath>
+</defs>
+</svg>

From d830f5045e72f465c809a60f9ef29f5bb1041a69 Mon Sep 17 00:00:00 2001
From: soyeong <mb535622@sookmyung.ac.kr>
Date: Mon, 3 Aug 2026 23:53:05 +0900
Subject: [PATCH 5/6] =?UTF-8?q?style:=20500=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/error.tsx        | 44 ++++++++++++------------
 apps/web/src/app/global-error.tsx | 57 ++++++++++++++-----------------
 2 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/apps/web/src/app/error.tsx b/apps/web/src/app/error.tsx
index 329e90e4..902077dc 100644
--- a/apps/web/src/app/error.tsx
+++ b/apps/web/src/app/error.tsx
@@ -5,6 +5,7 @@ import Link from 'next/link';
 import { useEffect } from 'react';
 
 import { WarningIconFill } from '@/assets/icons';
+import { buttonStyles } from '@/components/button/button.style';
 import { ROUTES } from '@/consts/route';
 
 type Props = {
@@ -18,30 +19,27 @@ function Error({ error, reset }: Props) {
   }, [error]);
 
   return (
-    <div className="flex h-full flex-col items-center gap-6 bg-bg-layer-basement pt-40">
-      <div className="flex flex-col items-center gap-4">
-        <WarningIconFill className="size-20 text-icon-error" />
-        <div className="flex flex-col items-center gap-2">
-          <h1 className="heading-1-bold text-text-neutral-secondary">오류가 발생했어요.</h1>
-          <p className="body-1-semibold text-text-neutral-tertiary">
-            일시적인 오류예요. 잠시 후 다시 시도해 주세요.
-          </p>
+    <div className="h-full bg-bg-layer-basement pt-padding-top">
+      <div className="flex flex-col items-center gap-[30px] pt-[calc(253px-env(safe-area-inset-top))]">
+        <div className="flex flex-col items-center gap-[25px]">
+          <WarningIconFill className="size-15 text-icon-warning" />
+          <div className="flex flex-col items-center gap-2">
+            <h1 className="heading-1-semibold text-text-neutral-primary">오류가 발생했어요</h1>
+            <p className="body-1-medium text-text-neutral-tertiary">잠시 후 다시 시도해 주세요</p>
+          </div>
+        </div>
+        <div className="flex gap-3">
+          <button
+            type="button"
+            onClick={reset}
+            className={buttonStyles({ variant: 'secondary', size: 'md' })}
+          >
+            다시 시도
+          </button>
+          <Link href={ROUTES.HOME} className={buttonStyles({ variant: 'primary', size: 'md' })}>
+            홈으로 가기
+          </Link>
         </div>
-      </div>
-      <div className="flex gap-3">
-        <button
-          type="button"
-          onClick={reset}
-          className="inline-flex cursor-pointer items-center justify-center rounded-[12px] border-[1.2px] border-gray-200 bg-bg-layer-floating px-[18px] py-[10px] body-1-semibold text-text-neutral-primary"
-        >
-          다시 시도
-        </button>
-        <Link
-          href={ROUTES.HOME}
-          className="inline-flex cursor-pointer items-center justify-center rounded-[12px] border border-bg-neutral-primary bg-bg-neutral-primary px-[18px] py-[10px] body-1-semibold text-text-neutral-inverse"
-        >
-          홈으로 가기
-        </Link>
       </div>
     </div>
   );
diff --git a/apps/web/src/app/global-error.tsx b/apps/web/src/app/global-error.tsx
index c95a6178..6bd7cad6 100644
--- a/apps/web/src/app/global-error.tsx
+++ b/apps/web/src/app/global-error.tsx
@@ -4,6 +4,8 @@ import * as Sentry from '@sentry/nextjs';
 import Link from 'next/link';
 import { useEffect } from 'react';
 
+import { WarningIconFill } from '@/assets/icons';
+import { buttonStyles } from '@/components/button/button.style';
 import { ROUTES } from '@/consts/route';
 import '@/styles/globals.css';
 
@@ -12,44 +14,37 @@ type Props = {
   reset: () => void;
 };
 
-// TODO: 임시 글로벌 에러 페이지 - 디자인 변경 필요
 export default function GlobalError({ error, reset }: Props) {
   useEffect(() => {
     Sentry.captureException(error);
   }, [error]);
 
   return (
-    <html lang="ko" className="h-full bg-gray-100">
-      <body className="mx-auto my-0 h-full max-w-120 bg-white antialiased">
-        <div className="flex h-screen w-full flex-col items-center justify-center gap-8 px-5">
-          <div className="w-full max-w-[400px] text-center">
-            <p className="title-lg mb-2">예기치 못한 오류가 발생했습니다</p>
-            <p className="body-md text-secondary mb-6">페이지를 새로고침해주세요.</p>
-
-            <div className="mb-4 rounded-lg bg-gray-50 p-4 text-left">
-              {error.message && (
-                <div>
-                  <span className="body-sm text-secondary font-medium">에러 메시지: </span>
-                  <span className="body-sm text-gray-900">{error.message}</span>
-                </div>
-              )}
+    <html lang="ko" className="h-full">
+      <body className="mx-auto my-0 h-full max-w-120 antialiased">
+        <div className="h-full bg-bg-layer-basement pt-padding-top">
+          <div className="flex flex-col items-center gap-[30px] pt-[calc(253px-env(safe-area-inset-top))]">
+            <div className="flex flex-col items-center gap-[25px]">
+              <WarningIconFill className="size-15 text-icon-warning" />
+              <div className="flex flex-col items-center gap-2">
+                <h1 className="heading-1-semibold text-text-neutral-primary">오류가 발생했어요</h1>
+              <p className="body-1-medium text-text-neutral-tertiary">
+                  잠시 후 다시 시도해 주세요
+                </p>
+              </div>
+            </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={reset}
+                className={buttonStyles({ variant: 'secondary', size: 'md' })}
+              >
+                다시 시도
+              </button>
+              <Link href={ROUTES.HOME} className={buttonStyles({ variant: 'primary', size: 'md' })}>
+                홈으로 가기
+              </Link>
             </div>
-          </div>
-
-          <div className="flex w-full max-w-[400px] gap-4">
-            <button
-              type="button"
-              onClick={reset}
-              className="body-lg flex-1 rounded-3xl bg-gray-900 py-3 text-center font-medium text-white"
-            >
-              다시 시도
-            </button>
-            <Link
-              href={ROUTES.HOME}
-              className="body-lg flex-1 rounded-3xl bg-gray-100 py-3 text-center font-medium text-gray-900"
-            >
-              홈으로
-            </Link>
           </div>
         </div>
       </body>

From 49c8bc2c19443f2f3ae15dc97733ffeefc26306d Mon Sep 17 00:00:00 2001
From: soyeong <mb535622@sookmyung.ac.kr>
Date: Tue, 4 Aug 2026 00:11:00 +0900
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20calc()=20=EC=97=B0=EC=82=B0=EC=9E=90?=
 =?UTF-8?q?=20=EA=B3=B5=EB=B0=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/error.tsx        | 2 +-
 apps/web/src/app/global-error.tsx | 2 +-
 apps/web/src/app/not-found.tsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/error.tsx b/apps/web/src/app/error.tsx
index 902077dc..519de9b8 100644
--- a/apps/web/src/app/error.tsx
+++ b/apps/web/src/app/error.tsx
@@ -20,7 +20,7 @@ function Error({ error, reset }: Props) {
 
   return (
     <div className="h-full bg-bg-layer-basement pt-padding-top">
-      <div className="flex flex-col items-center gap-[30px] pt-[calc(253px-env(safe-area-inset-top))]">
+      <div className="flex flex-col items-center gap-[30px] pt-[calc(253px_-_env(safe-area-inset-top))]">
         <div className="flex flex-col items-center gap-[25px]">
           <WarningIconFill className="size-15 text-icon-warning" />
           <div className="flex flex-col items-center gap-2">
diff --git a/apps/web/src/app/global-error.tsx b/apps/web/src/app/global-error.tsx
index 6bd7cad6..b2dd8e52 100644
--- a/apps/web/src/app/global-error.tsx
+++ b/apps/web/src/app/global-error.tsx
@@ -23,7 +23,7 @@ export default function GlobalError({ error, reset }: Props) {
     <html lang="ko" className="h-full">
       <body className="mx-auto my-0 h-full max-w-120 antialiased">
         <div className="h-full bg-bg-layer-basement pt-padding-top">
-          <div className="flex flex-col items-center gap-[30px] pt-[calc(253px-env(safe-area-inset-top))]">
+          <div className="flex flex-col items-center gap-[30px] pt-[calc(253px_-_env(safe-area-inset-top))]">
             <div className="flex flex-col items-center gap-[25px]">
               <WarningIconFill className="size-15 text-icon-warning" />
               <div className="flex flex-col items-center gap-2">
diff --git a/apps/web/src/app/not-found.tsx b/apps/web/src/app/not-found.tsx
index a8afe0d2..8c36ea6d 100644
--- a/apps/web/src/app/not-found.tsx
+++ b/apps/web/src/app/not-found.tsx
@@ -7,7 +7,7 @@ import { ROUTES } from '@/consts/route';
 function NotFound() {
   return (
     <div className="h-full bg-bg-layer-basement pt-padding-top">
-      <div className="flex flex-col items-center gap-[30px] pt-[calc(253px-env(safe-area-inset-top))]">
+      <div className="flex flex-col items-center gap-[30px] pt-[calc(253px_-_env(safe-area-inset-top))]">
         <div className="flex flex-col items-center gap-[25px]">
           <BasketNotFoundIcon className="size-15" aria-hidden />
           <div className="flex flex-col items-center gap-2">