chore: rebase 간 충돌 해결

결
boostcampwm-2024 · Nov 28, 2024 · b3b8f3b · b3b8f3b
1 parent 7096336
commit b3b8f3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/apps/client/src/components/PlanningPokerFloatingButton.tsx b/apps/client/src/components/PlanningPokerFloatingButton.tsx
@@ -247,7 +247,7 @@ function PlanningPokerFloatingButton() {
             animate={{ opacity: 1, y: 0 }}
             exit={{ opacity: 0, y: 10 }}
             transition={{ duration: 0.3 }}
-            className="fixed bottom-32 right-12 flex flex-col gap-2"
+            className="fixed bottom-32 right-12 z-50 flex flex-col gap-2"
           >
             <AnimatePresence>
               {users.map((user, index) => (
@@ -307,7 +307,7 @@ function PlanningPokerFloatingButton() {
         )}
       </AnimatePresence>
 
-      <div className="fixed bottom-28 right-24" role="button" aria-expanded={isExpanded}>
+      <div className="fixed bottom-28 right-24 z-50" role="button" aria-expanded={isExpanded}>
         <ToggleCard isExpanded={isExpanded} toggleExpand={toggleExpand} />
         {CARDS.map((card, index) => {
           const baseY = isExpanded ? 0 : -(index + 1) * 1;

diff --git a/apps/client/src/pages/TaskDetail.tsx b/apps/client/src/pages/TaskDetail.tsx
@@ -63,7 +63,7 @@ export function TaskDetail() {
 
           <motion.div
             key="panel"
-            className="bg-surface fixed inset-y-0 right-0 z-50 w-full border-l md:w-2/3"
+            className="bg-surface fixed inset-y-0 right-0 z-40 w-full border-l md:w-2/3"
             initial={{ x: '100%' }}
             animate={{ x: 0 }}
             exit={{ x: '100%' }}

diff --git a/apps/client/src/routes/_auth.$project.board.$taskId.tsx b/apps/client/src/routes/_auth.$project.board.$taskId.tsx
@@ -68,7 +68,7 @@ export function ErrorComponent({ error, reset }: { error: Error; reset: () => vo
 
           <motion.div
             key="panel"
-            className="bg-surface fixed inset-y-0 right-0 z-50 w-full border-l md:w-2/3"
+            className="bg-surface fixed inset-y-0 right-0 z-40 w-full border-l md:w-2/3"
             initial={{ x: '100%' }}
             animate={{ x: 0 }}
             exit={{ x: '100%' }}

diff --git a/apps/client/src/routes/_auth.$project.board.tsx b/apps/client/src/routes/_auth.$project.board.tsx
@@ -1,6 +1,5 @@
 import { Suspense } from 'react';
 import { createFileRoute, Outlet } from '@tanstack/react-router';
-import Board from '@/pages/Board.tsx';
 import PlanningPokerFloatingButton from '@/components/PlanningPokerFloatingButton';
 import { boardAPI } from '@/features/project/board/api.ts';
 import { Board } from '@/pages/Board.tsx';