Skip to content

Commit 4418478

Browse files
authored
Merge pull request #174 from codeit-sprint-part3-6team/#173_모달-오버레이-및-인풋-수정
♻️ 모달 오버레이 및 인풋 수정
2 parents 6115511 + 15c4e12 commit 4418478

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

src/components/common/modal/general/GeneralModal.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ export default function GeneralModal({
3434
if (!isOpen) return null;
3535

3636
return (
37-
<OverlayContainer>
38-
<div className={styles['modal-section']}>
37+
<OverlayContainer onClose={onClose}>
38+
<div
39+
className={styles['modal-section']}
40+
onClick={(e) => e.stopPropagation()}
41+
>
3942
<div className={styles.top}>
4043
<div>
4144
<h1 className={styles.title}>{title}</h1>

src/components/common/sidebar/Sidebar.module.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@
213213
display: none;
214214
}
215215

216+
.menu-dashboard {
217+
justify-content: center;
218+
}
219+
216220
.color-circle {
217221
/* margin: 0 0 20px 0; */
218222
margin: 0;

src/components/common/sidebar/Sidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ export default function Sidebar() {
170170

171171
{/* 모달창 */}
172172
{showModal && (
173-
<OverlayContainer>
174-
<div className={styles.modal}>
173+
<OverlayContainer onClose={closeModal}>
174+
<div className={styles.modal} onClick={(e) => e.stopPropagation()}>
175175
<h2>새로운 대시보드</h2>
176176
<h3>대시보드 이름</h3>
177177
<input

src/components/product/mydashboard/DashboardList.module.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
color: var(--black-medium);
7575
}
7676

77-
.modal-input:focus {
78-
border: 1px solid var(--gray-medium);
79-
}
80-
8177
.color-picker {
8278
margin-top: 16px;
8379
margin-bottom: 40px;

src/components/product/mydashboard/DashboardList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ export default function DashboardList() {
146146

147147
{/* 모달창 */}
148148
{showModal && (
149-
<OverlayContainer>
150-
<div className={styles.modal}>
149+
<OverlayContainer onClose={closeModal}>
150+
<div className={styles.modal} onClick={(e) => e.stopPropagation()}>
151151
<h2>새로운 대시보드</h2>
152152
<h3>대시보드 이름</h3>
153153
<input

src/components/product/mydashboard/InvitationList.module.css

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,11 @@
1010
margin-bottom: 32px;
1111
}
1212

13-
.input-container {
14-
width: 100%;
15-
border: 1px solid var(--gray-medium);
16-
border-radius: 6px;
17-
gap: 8px;
18-
display: flex;
19-
align-items: center;
20-
gap: 8px;
21-
}
22-
2313
.icon {
14+
position: fixed;
2415
margin-left: 16px;
2516
cursor: pointer;
17+
margin-top: 8px;
2618
}
2719

2820
.input::placeholder {
@@ -32,7 +24,13 @@
3224
}
3325

3426
.input {
35-
border-style: none;
27+
padding-left: 48px;
28+
width: 100%;
29+
border: 1px solid var(--gray-medium);
30+
border-radius: 6px;
31+
gap: 8px;
32+
display: flex;
33+
align-items: center;
3634
height: 40px;
3735
}
3836

@@ -242,15 +240,14 @@
242240
}
243241

244242
.skeleton-title {
245-
padding: 0;
243+
display: none;
246244
}
247245

248246
.skeleton-row {
249-
display: flex;
247+
flex-direction: column;
250248
gap: 20px;
251-
align-items: center;
252-
height: 52px;
253-
margin-bottom: 20px;
249+
align-items: normal;
250+
height: 130px;
254251
}
255252
}
256253

0 commit comments

Comments
 (0)