Skip to content

Commit 1290d69

Browse files
authored
Merge pull request #114 from gyoyeon-kim/card-table
[Refector] Modal: hover 효과 / Colum : 반응형
2 parents d58b8f8 + fc8fa56 commit 1290d69

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

src/components/columnCard/AddColumnModal.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ export default function AddColumnModal({
2525
pattern,
2626
}: AddColumnModalProps) {
2727
return (
28-
<Modal isOpen={isOpen} onClose={onClose}>
28+
<Modal
29+
isOpen={isOpen}
30+
onClose={onClose}
31+
width="w-[327px] sm:w-[568px]"
32+
height="h-[258px] sm:h-[266px]"
33+
>
2934
<div className="flex flex-col gap-3">
3035
<h2 className="text-2xl font-bold">새 칼럼 생성</h2>
3136

@@ -41,7 +46,7 @@ export default function AddColumnModal({
4146
/>
4247
</label>
4348

44-
<div className="flex justify-between">
49+
<div className="flex justify-between gap-4">
4550
<CustomBtn variant="outlineDisabled" onClick={onClose}>
4651
취소
4752
</CustomBtn>

src/components/columnCard/ColumnDeleteModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ export default function ColumnDeleteModal({
1515
}: ColumnDeleteModalProps) {
1616
return (
1717
<Modal
18-
width="w-[568px]"
19-
height="h-[174px]"
2018
isOpen={isOpen}
2119
onClose={onClose}
20+
width="w-[327px] sm:w-[568px]"
21+
height="h-[160px] sm:h-[174px]"
2222
>
23-
<div className="flex flex-col gap-10 text-center">
23+
<div className="flex flex-col sm:gap-10 gap-6 text-center">
2424
<p className="text-xl mt-1.5">칼럼의 모든 카드가 삭제됩니다.</p>
2525
<div className="flex justify-between gap-3">
2626
<CustomBtn variant="outlineDisabled" onClick={onClose}>

src/components/columnCard/ColumnManageModal.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// components/column/ColumnManageModal.tsx
21
import { useState } from "react";
32
import { Modal } from "../modal/Modal";
43
import { CustomBtn } from "../button/CustomButton";
@@ -23,7 +22,12 @@ export default function ColumnManageModal({
2322
const [newTitle, setNewTile] = useState(columnTitle);
2423

2524
return (
26-
<Modal isOpen={isOpen} onClose={onClose}>
25+
<Modal
26+
isOpen={isOpen}
27+
onClose={onClose}
28+
width="w-[327px] sm:w-[568px]"
29+
height="h-[258px] sm:h-[266px]"
30+
>
2731
<div className="relative flex flex-col gap-5">
2832
<Image
2933
src="/svgs/close.svg"

src/components/modal/ChangeBebridge.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ const ChangeBebridge = () => {
8989
{colors.map((color, index) => (
9090
<div key={index} className="relative">
9191
<button
92-
className={`cursor-pointer w-[30px] h-[30px] rounded-[15px] mr-2 transition-all duration-200
93-
hover:opacity-70 hover:scale-110`}
92+
className="cursor-pointer w-[30px] h-[30px] rounded-[15px] mr-2 transition-all duration-200
93+
hover:opacity-70 hover:scale-110"
9494
style={{ backgroundColor: color }}
9595
onClick={() => setSelected(index)} // 색상 선택 시 selected 업데이트
9696
/>

src/components/modal/NewDashboard.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ export default function NewDashboard({
7171
{colors.map((color, index) => (
7272
<div key={index} className="relative">
7373
<button
74-
className="cursor-pointer w-[30px] h-[30px] rounded-full mr-2"
74+
className="cursor-pointer w-[30px] h-[30px] rounded-[15px] mr-2 transition-all duration-200
75+
hover:opacity-70 hover:scale-110"
7576
style={{ backgroundColor: color }}
7677
onClick={() => setSelected(index)}
7778
/>

src/pages/dashboard/[dashboardId]/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ export default function Dashboard() {
101101
if (!isReady) return <div>로딩 중...</div>;
102102

103103
return (
104-
<div className="flex overflow-x-auto min-w-fit min-h-screen">
104+
<div className="flex h-screen overflow-hidden">
105105
<SideMenu teamId={teamId} dashboardList={dashboardList} />
106106

107-
<div className="flex-1">
107+
<div className="flex flex-col flex-1 overflow-hidden">
108108
<HeaderDashboard variant="dashboard" dashboardId={dashboardId} />
109109

110110
<div className="flex overflow-x-auto ">

0 commit comments

Comments
 (0)