From 645a674fddd6d230df816dc70925aea6266d8e7a Mon Sep 17 00:00:00 2001
From: Hyerin <125418818+ooherin@users.noreply.github.com>
Date: Mon, 9 Dec 2024 00:11:16 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[FE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=20=EB=B0=B0=EB=84=88=20=ED=9B=84=EB=B2=84=20?=
 =?UTF-8?q?=EC=83=89=EC=83=81=EC=9D=84=20=EB=84=A3=EB=8A=94=EB=8B=A4.=20?=
 =?UTF-8?q?=20(#1054)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ChecklistList/CustomBanner.tsx    | 16 +++++++++++++---
 frontend/src/pages/ChecklistListPage.tsx         |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/ChecklistList/CustomBanner.tsx b/frontend/src/components/ChecklistList/CustomBanner.tsx
index 203bd5e5..4cca8e46 100644
--- a/frontend/src/components/ChecklistList/CustomBanner.tsx
+++ b/frontend/src/components/ChecklistList/CustomBanner.tsx
@@ -10,16 +10,22 @@ interface Props {
   buttonText: string;
   Icon: React.ReactElement;
   buttonDetailText: string;
+  hoverButtonColor: string;
 }
 
-const CustomBanner = ({ onClick, Icon, title, buttonColor, buttonText, buttonDetailText }: Props) => {
+const CustomBanner = ({ hoverButtonColor, onClick, Icon, title, buttonColor, buttonText, buttonDetailText }: Props) => {
   return (
     <S.Banner onClick={onClick}>
       <S.Wrapper>
         {Icon}
         <S.Title>{title}</S.Title>
       </S.Wrapper>
-      <S.Button aria-label={buttonDetailText} label={buttonText} buttonColor={buttonColor} />
+      <S.Button
+        aria-label={buttonDetailText}
+        label={buttonText}
+        buttonColor={buttonColor}
+        hoverButtonColor={hoverButtonColor}
+      />
     </S.Banner>
   );
 };
@@ -51,7 +57,7 @@ const S = {
   Title: styled.span`
     ${flexCenter}
   `,
-  Button: styled(Button)<{ buttonColor: string }>`
+  Button: styled(Button)<{ buttonColor: string; hoverButtonColor: string }>`
     padding: 0.6rem 1rem;
 
     background-color: ${({ buttonColor }) => buttonColor};
@@ -62,5 +68,9 @@ const S = {
     font-size: ${({ theme }) => theme.text.size.small};
 
     cursor: pointer;
+
+    &:hover {
+      background-color: ${({ hoverButtonColor }) => hoverButtonColor};
+    }
   `,
 };
diff --git a/frontend/src/pages/ChecklistListPage.tsx b/frontend/src/pages/ChecklistListPage.tsx
index ed833fa5..90451a8c 100644
--- a/frontend/src/pages/ChecklistListPage.tsx
+++ b/frontend/src/pages/ChecklistListPage.tsx
@@ -47,14 +47,16 @@ const ChecklistListPage = () => {
             buttonColor={theme.palette.green500}
             buttonText="편집하기"
             buttonDetailText={'체크리스트 질문을 편집하려면 이 버튼을 누르세요.'}
+            hoverButtonColor={theme.palette.green600}
           />
           <CustomBanner
             onClick={handleClickMoveQuestionSelectPage}
             Icon={<LampIcon width={30} height={30} aria-hidden="true" />}
-            title={'체크리스트를 비교'}
+            title={'체크리스트 비교'}
             buttonColor={theme.palette.yellow600}
             buttonText="비교하기"
             buttonDetailText={'체크리스트 질문을 편집하려면 이 버튼을 누르세요.'}
+            hoverButtonColor={theme.palette.yellow700}
           />
         </FlexBox.Vertical>
         <S.Spacer height="1.4rem" />

From 043a9834e7a5f9124bb6a3fba7b56acad5392b7f Mon Sep 17 00:00:00 2001
From: Seyeong Jeon <86130706+skiende74@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:37:59 +0900
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EC=98=A5=ED=83=91=EC=9D=BC?=
 =?UTF-8?q?=EB=95=8C=20=EC=B8=B5=EC=88=98=EB=A5=BC=20=EC=A0=9C=EA=B1=B0=20?=
 =?UTF-8?q?(#1058)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/NewChecklist/NewRoomInfoForm/RoomFloor.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/NewChecklist/NewRoomInfoForm/RoomFloor.tsx b/frontend/src/components/NewChecklist/NewRoomInfoForm/RoomFloor.tsx
index ef6ab14e..85d2df9f 100644
--- a/frontend/src/components/NewChecklist/NewRoomInfoForm/RoomFloor.tsx
+++ b/frontend/src/components/NewChecklist/NewRoomInfoForm/RoomFloor.tsx
@@ -11,7 +11,7 @@ const RoomFloor = () => {
 
   const handleClickDropdown = (level: string) => {
     floorLevel.set(level);
-    if (level === '반지하/지하') {
+    if (level === '반지하/지하' || level === '옥탑') {
       floor.set('');
     }
   };

From e6680093fd9099ce9e44439e7685f2ee34405fd3 Mon Sep 17 00:00:00 2001
From: Hyerin <125418818+ooherin@users.noreply.github.com>
Date: Mon, 9 Dec 2024 16:58:53 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[FE]=20=ED=83=AD=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=95=B8=EB=93=A4=EB=A7=81=EC=9D=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4.=20=20(#1059)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NewChecklist/MoveNextButton.tsx           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/NewChecklist/MoveNextButton.tsx b/frontend/src/components/NewChecklist/MoveNextButton.tsx
index 4861aadb..159f8912 100644
--- a/frontend/src/components/NewChecklist/MoveNextButton.tsx
+++ b/frontend/src/components/NewChecklist/MoveNextButton.tsx
@@ -5,7 +5,6 @@ import { useTabContext } from '@/components/_common/Tabs/TabContext';
 import useTabs from '@/hooks/useTabs';
 import useChecklistStore from '@/store/useChecklistStore';
 import { flexRow } from '@/styles/common';
-import theme from '@/styles/theme';
 
 interface Props {
   marginTop?: string;
@@ -23,11 +22,11 @@ const MoveNextButton = ({ marginTop = '0', marginBottom = '0' }: Props) => {
 
   return (
     <S.ContentBox marginTop={marginTop} marginBottom={marginBottom}>
-      <S.Button onClick={handleClickPrev}>
-        <S.Text color={theme.palette.yellow600}>{'< 이전으로 이동'}</S.Text>
+      <S.Button onClick={handleClickPrev} disabled={currentTabId === -1}>
+        {`< 이전으로 이동`}
       </S.Button>
-      <S.Button onClick={handleClickNext}>
-        <S.Text color={theme.palette.yellow600}>{'다음으로 이동 >'}</S.Text>
+      <S.Button onClick={handleClickNext} disabled={currentTabId === categories.length}>
+        {'다음으로 이동 >'}
       </S.Button>
     </S.ContentBox>
   );
@@ -36,10 +35,6 @@ const MoveNextButton = ({ marginTop = '0', marginBottom = '0' }: Props) => {
 export default React.memo(MoveNextButton);
 
 const S = {
-  Text: styled.span<{ color: string }>`
-    color: ${({ color }) => color};
-    font-weight: ${({ theme }) => theme.text.weight.bold};
-  `,
   Button: styled.button`
     margin: 10px 0;
     padding: 0 15px;
@@ -47,10 +42,17 @@ const S = {
 
     background-color: ${({ theme }) => theme.palette.white};
 
-    font-weight: ${({ theme }) => theme.text.weight.medium};
+    color: ${({ theme }) => theme.palette.yellow600};
+    font-weight: ${({ theme }) => theme.text.weight.bold};
     font-size: ${({ theme }) => theme.text.size.small};
     line-height: 2.5;
     border-radius: 3rem;
+
+    &:disabled {
+      border: 0.25rem solid ${({ theme }) => theme.palette.grey300};
+
+      color: ${({ theme }) => theme.palette.grey500};
+    }
   `,
   ContentBox: styled.div<{ marginTop: string; marginBottom: string }>`
     ${flexRow}