Skip to content

Commit 331494f

Browse files
authored
Merge branch 'main' into feat/main-QA-4
2 parents 9b21a83 + 0b9ba32 commit 331494f

File tree

3 files changed

+32
-56
lines changed

3 files changed

+32
-56
lines changed

src/pages/MainVer2Page2.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
width: 407px;
3232
height: 635px;
3333
@include r.media-laptop {
34-
width: 382px;
35-
height: 596px;
34+
width: 407px;
35+
height: 635px; /* 635px */
3636
}
3737
@include r.media-tablet {
3838
width: 608px;

src/pages/work/PostWork.jsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,23 @@ const PostWork = () => {
111111
)}
112112
<div className=" left-side">
113113
<div className=" inside-field">
114-
<div className="inside-field-title">
115-
<h1>자신만의</h1>
116-
<h1>작품을</h1>
117-
<h1>등록해주세요!</h1>
114+
<div className="inside-field-title h1-bold">
115+
<p>자신만의</p>
116+
<p>작품을</p>
117+
<p>등록해주세요!</p>
118118
</div>
119119

120-
<div className="stage-info-container">
121-
<h5 className="title">스테이지 시스템 안내</h5>
120+
<div className=" stage-info-container">
121+
<h5 className="title h5-bold">스테이지 시스템 안내</h5>
122122

123-
<div className="contants">
123+
<div className=" contants">
124124
{/* 포도알 */}
125-
<div className="step">
125+
<div className=" step">
126126
<div className="icon">
127127
<img src={podoalIcon} alt="podoal" />
128-
<p>포도알</p>
128+
<p className="p-large-medium">포도알</p>
129129
</div>
130-
<div className="info">
130+
<div className="p-small-medium info">
131131
<p>
132132
• 대본 가격 <span>무료</span>만 설정 가능
133133
</p>
@@ -145,10 +145,10 @@ const PostWork = () => {
145145
</div>
146146

147147
{/* 포도송이 */}
148-
<div className="step">
148+
<div className="step ">
149149
<div className="icon">
150150
<img src={podoSongIIcon} alt="podoSongI" />
151-
<p>포도송이</p>{" "}
151+
<p className="p-large-medium">포도송이</p>{" "}
152152
</div>
153153
<div className="info">
154154
<div className="TBD-info">
@@ -165,14 +165,14 @@ const PostWork = () => {
165165
<div className="step">
166166
<div className="icon">
167167
<img src={wine} alt="wine" style={{ height: "43px" }} />
168-
<p>와인</p>
168+
<p className="p-large-medium">와인</p>
169169
</div>
170170
</div>
171171
</div>
172172
</div>
173173

174174
<div>
175-
<div className="upload-title items-center gap-[8px] relative">
175+
<div className="upload-title items-center gap-[8px] relative ">
176176
<h6>작품 등록 신청</h6>
177177
{/* 팝업 메뉴 */}
178178
<button

src/pages/work/PostWork.scss

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,18 @@
33

44
.post-work {
55
width: 100vw;
6-
76
height: 1080px;
7+
// 이미지를 absolute로 설정하여 높이 직접 입력 필요
8+
// height: fit-content;
9+
@include r.media-desktop {
10+
height: 1080px;
11+
}
12+
@include r.media-laptop {
13+
height: 1080px;
14+
}
15+
@include r.media-mobile {
16+
height: 1000px;
17+
}
818
}
919

1020
.post-work .post-work-wrap {
@@ -73,7 +83,7 @@
7383
.post-work .inside-field-title {
7484
margin-top: 174px;
7585
@include r.media-laptop {
76-
margin-top: 90px;
86+
margin-top: 174px;
7787
}
7888
@include r.media-mobile {
7989
margin-top: 50px;
@@ -98,34 +108,20 @@
98108
display: flex;
99109
flex-direction: column;
100110
margin-top: 87px;
101-
margin-bottom: 66px;
111+
margin-bottom: 64px;
102112

103113
@include r.media-mobile {
104114
margin-top: 58px;
105115
}
106116

107-
.title {
108-
color: #000;
109-
/* H5/Bold */
110-
font-family: Pretendard;
111-
font-size: 1.25rem;
112-
font-style: normal;
113-
font-weight: 700;
114-
line-height: 1.75rem; /* 140% */
115-
letter-spacing: -0.025rem;
116-
}
117-
118117
.contants {
119118
display: grid;
120119
grid-template-columns: 37fr 5fr 30fr 5fr 25fr;
121120

122-
margin-top: 4.907vh;
121+
margin-top: 53px;
123122

124123
height: 100%;
125124

126-
@include r.media-mobile {
127-
grid-template-columns: 120px 30px 104px 30px 110px;
128-
}
129125
p {
130126
white-space: nowrap;
131127
}
@@ -138,38 +134,19 @@
138134
.icon {
139135
display: flex;
140136
flex-direction: column;
141-
gap: 1.0185vh;
137+
gap: 11px;
142138

143139
align-items: center;
144140
justify-content: center;
145-
margin-bottom: 1.9444vh;
141+
margin-bottom: 21px;
146142

147143
box-sizing: border-box;
148-
149-
p {
150-
color: #000;
151-
152-
/* Paragraph/Large/Medium */
153-
font-family: Pretendard;
154-
font-size: 18px;
155-
font-style: normal;
156-
font-weight: 500;
157-
line-height: 28px; /* 155.556% */
158-
}
159144
}
160145
.info {
161146
display: flex;
162147
flex-direction: column;
163148
gap: 2px;
164149

165-
color: var(--ect-black, #000);
166-
167-
font-family: Pretendard;
168-
font-size: 0.875rem;
169-
font-style: normal;
170-
font-weight: 500;
171-
line-height: 1.25rem; /* 142.857% */
172-
173150
span {
174151
text-decoration-line: underline;
175152
text-decoration-style: solid;
@@ -236,7 +213,6 @@
236213
align-items: center;
237214

238215
// FileInputBox에 상단 margin 존재 - 제거 예정, 0.63rem만큼의 차 필요
239-
margin-bottom: calc(16px - 0.63rem);
240216
}
241217

242218
.post-work .upload-title h6 {

0 commit comments

Comments
 (0)