Skip to content

Commit eb9c728

Browse files
authored
Merge pull request #161 from codeit-sprint-part3-6team/#59_페이지_대시보드_수정
페이지 대시보드 수정 - 초대내역, 구성원 style 수정
2 parents 1d6a261 + c81434d commit eb9c728

File tree

6 files changed

+35
-33
lines changed

6 files changed

+35
-33
lines changed

package-lock.json

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/product/edit/InviteTitle/InviteList.module.css

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,34 @@
33
justify-content: space-between;
44
padding-right: 28px;
55
padding-left: 28px;
6-
margin-top: 10px;
6+
margin-bottom: 16px;
77
}
88

99
.title {
10-
margin-top: 6px;
1110
font-size: 18px;
1211
font-weight: 400;
1312
line-height: 26px;
1413
}
1514

1615
.line {
17-
margin-top: 10px;
16+
margin-bottom: 16px;
1817
border: none;
1918
border-top: 1px solid var(--gray-bright);
2019
}
2120

2221
@media screen and (max-width: 743px) {
2322
.container {
24-
padding-left: 0;
25-
padding-right: 0;
26-
margin-top: 10px;
23+
padding-left: 20px;
24+
padding-right: 20px;
25+
margin-bottom: 10px;
2726
}
2827

2928
.title {
30-
margin-top: 5px;
29+
font-size: 14px;
30+
line-height: 24px;
3131
}
3232

3333
.line {
34-
margin-top: 5px;
35-
font-size: 14px;
36-
line-height: 24px;
34+
margin-bottom: 10px;
3735
}
3836
}

src/components/product/edit/InviteTitle/InviteTitle.module.css

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
display: flex;
1313
flex-direction: row;
1414
justify-content: space-between;
15+
align-items: center;
16+
margin-bottom: 32px;
1517
}
1618

1719
.title {
1820
font-weight: 700;
1921
font-size: 24px;
2022
line-height: 32px;
21-
padding-left: 14px;
22-
margin-bottom: 20px;
23+
padding-right: 28px;
24+
padding-left: 28px;
2325
}
2426

2527
.button-section {
@@ -65,8 +67,8 @@
6567
}
6668

6769
.sub-title {
68-
margin-top: 20px;
69-
margin-left: 15px;
70+
margin-top: 32px;
71+
margin-left: 28px;
7072
margin-bottom: 20px;
7173
font-weight: 400;
7274
font-size: 16px;
@@ -79,10 +81,6 @@
7981
width: 544px;
8082
}
8183

82-
.pagination-button {
83-
display: none;
84-
}
85-
8684
.sub-title {
8785
margin-top: 15px;
8886
}
@@ -102,10 +100,12 @@
102100

103101
.title {
104102
font-size: 20px;
103+
padding-right: 15px;
104+
padding-left: 15px;
105+
margin-top: -30px;
105106
}
106107

107108
.button-section {
108-
margin-top: 5px;
109109
flex-direction: column;
110110
gap: 0;
111111
}
@@ -123,7 +123,7 @@
123123
}
124124

125125
.sub-title {
126-
margin-top: -30px;
126+
margin-top: -55px;
127127
font-weight: 400;
128128
font-size: 14px;
129129
line-height: 24px;
@@ -132,4 +132,8 @@
132132
.invite-button-section {
133133
margin: 8px 0 0 auto;
134134
}
135+
136+
.list {
137+
margin-top: 45px;
138+
}
135139
}

src/components/product/edit/InviteTitle/InviteTitle.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ export default function InviteTitle() {
125125
</div>
126126
<div className={styles['name-section']}>
127127
<h2 className={styles['sub-title']}>이메일</h2>
128-
<InviteList members={members} setMembers={setMembers} />
128+
<div className={styles['list']}>
129+
<InviteList members={members} setMembers={setMembers} />
130+
</div>
129131
</div>
130132
<InviteModal
131133
label="이메일"

src/components/product/edit/MemberTitle/MemberList.module.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
justify-content: space-between;
44
padding-right: 28px;
55
padding-left: 28px;
6-
margin-top: 10px;
6+
margin-bottom: 16px;
77
}
88

99
.crown {
@@ -13,14 +13,14 @@
1313
}
1414

1515
.line {
16-
margin-top: 10px;
16+
margin-bottom: 16px;
1717
border: none;
1818
border-top: 1px solid var(--gray-bright);
1919
}
2020

2121
@media screen and (max-width: 743px) {
2222
.container {
23-
margin-top: 8px;
23+
margin-bottom: 12px;
2424
}
2525

2626
.crown {
@@ -31,6 +31,6 @@
3131
}
3232

3333
.line {
34-
margin-top: 13px;
34+
margin-bottom: 12px;
3535
}
3636
}

src/components/product/edit/MemberTitle/MemberTitle.module.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
display: flex;
1313
flex-direction: row;
1414
justify-content: space-between;
15+
align-items: center;
16+
margin-bottom: 27px;
1517
}
1618

1719
.title {
1820
font-weight: 700;
1921
font-size: 24px;
2022
line-height: 32px;
2123
padding-left: 14px;
22-
margin-bottom: 20px;
2324
}
2425

2526
.button {
@@ -39,7 +40,7 @@
3940
.sub-title {
4041
margin-top: 20px;
4142
margin-left: 15px;
42-
margin-bottom: 20px;
43+
margin-bottom: 19px;
4344
font-weight: 400;
4445
font-size: 16px;
4546
line-height: 26px;
@@ -64,6 +65,9 @@
6465
padding: 20px 16px 20px 16px;
6566
}
6667

68+
.member-section {
69+
margin-bottom: 18px;
70+
}
6771
.page-info {
6872
margin-right: 10px;
6973
font-weight: 400;

0 commit comments

Comments
 (0)