Skip to content

Commit afa2b27

Browse files
authored
Merge pull request #242 from Podo-Store/feat/main-QA-4
Feat/main qa 4
2 parents ea0712d + 49ddaa1 commit afa2b27

File tree

3 files changed

+37
-28
lines changed

3 files changed

+37
-28
lines changed

src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import "./styles/utilities.css";
5656
function App() {
5757
return (
5858
<div className="App">
59-
<BrowserWarning />
59+
{/* <BrowserWarning /> */}
6060
<BrowserRouter>
6161
<AuthProvider>
6262
<Routes>

src/pages/MainVer2.jsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import "./MainVer2Page2.scss";
3131
const MainVer2 = () => {
3232
const navigate = useNavigate();
3333
const {
34-
widthConditions: { isLaptop, isTablet, isMobile },
34+
widthConditions: { isDesktop, isLaptop, isTablet, isMobile },
3535
} = useWindowDimensions();
3636

3737
const content2Title = () => "작품 둘러보기";
@@ -64,40 +64,44 @@ const MainVer2 = () => {
6464

6565
<div>
6666
<div className="page1">
67-
<section className=" page1-width">
67+
<section className="page1-width">
6868
<div
69-
className={` page1-title-img w-fit pt-[110px] ${
69+
className={`page1-title-img pt-[136px] ${
7070
isLaptop
71-
? "items-center gap-[80px]"
71+
? "items-center gap-[80px]"
7272
: isTablet
73-
? " gap-[60px]"
73+
? "gap-[60px]"
7474
: "gap-[42px]"
75-
} justify-center`}
75+
} justify-between`}
7676
>
7777
<div
7878
className={` ${
7979
isLaptop ? "" : ""
8080
} h-fit title-wrap f-dir-column p-relative`}
8181
>
82-
<h1 className=" title">
82+
<h1 className="title">
8383
대본과 {isLaptop && <br />}공연권 거래
8484
<br />
8585
포도상점에서
8686
</h1>
8787

88-
<h5 className="sub-title">
88+
<h5 className="sub-title whitespace-nowrap">
8989
편리하게 대본과 공연권을 거래해요.
9090
<br />
9191
여러분들이 원하던 스토리 IP 플랫폼,
9292
<br />
9393
포도상점을 시작하세요!
9494
</h5>
9595
</div>
96-
{!isMobile ? (
97-
<img src={circleIcon} alt="circle" className="" />
96+
{!isTablet && !isMobile ? (
97+
<img src={circleIcon} alt="circle" className="circle-icon" />
9898
) : (
9999
<div className="flex justify-end">
100-
<img src={circleIcon} alt="circle" className=" w-[438px]" />
100+
<img
101+
src={circleIcon}
102+
alt="circle"
103+
className="circle-icon w-[438px]"
104+
/>
101105
</div>
102106
)}
103107
</div>

src/pages/MainVer2.scss

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
@use "./../styles/_responsive.scss" as r;
22

33
.main-ver2 .page1 {
4-
height: 1361px;
5-
4+
margin-bottom: 98px;
65
background: linear-gradient(180deg, #f5f0ff 0%, #fff 100%);
76
@include r.media-tablet {
8-
align-items: end;
7+
display: flex;
8+
flex-direction: column;
9+
align-items: center;
910
}
1011
@include r.media-mobile {
1112
align-items: center;
@@ -17,26 +18,33 @@
1718
height: 85vh;
1819

1920
@include r.media-tablet {
20-
width: calc(100% - 80px);
21+
// width: calc(100% - 80px);
22+
width: 100%;
2123
height: auto;
2224
}
2325
@include r.media-mobile {
2426
width: 100%;
2527
}
2628
}
2729

28-
.page1-title-img {
30+
.main-ver2 .page1-title-img {
2931
display: flex;
3032
flex-direction: row;
3133

3234
margin: auto;
3335

36+
width: 1280px;
37+
@include r.media-laptop {
38+
width: 1120px;
39+
}
3440
@include r.media-tablet {
3541
flex-direction: column;
3642
gap: 0px;
43+
44+
width: 768px;
3745
}
3846
@include r.media-mobile {
39-
width: 100%;
47+
width: 480px;
4048
}
4149
}
4250
.main-ver2 .page1 .title-wrap {
@@ -48,19 +56,24 @@
4856

4957
@include r.media-tablet {
5058
gap: 0;
51-
width: 768px;
59+
60+
padding-left: 80px;
5261
}
62+
5363
@include r.media-mobile {
54-
width: 480px;
64+
padding-left: 25px;
5565
}
5666
}
5767

5868
.main-ver2 .page1 .title {
69+
padding-top: 138px;
70+
5971
font-size: 6.667vh; /* 72px */
6072
font-style: normal;
6173
font-weight: 700;
6274
line-height: 120%; /* 86.4px */
6375
@include r.media-tablet {
76+
padding-top: 0;
6477
margin-bottom: 70px;
6578

6679
font-size: 64px;
@@ -114,18 +127,10 @@
114127
}
115128

116129
.main-ver2 .page1 .circle-icon {
117-
position: absolute;
118-
top: 11.852vh; // 128px
119-
right: 12.5vw; // 240px
120-
121130
width: 652px;
122131
height: 641px;
123132

124-
transform: translateX(-18px);
125133
@include r.media-laptop {
126-
top: 12.5926vh; // 136px
127-
right: 80px;
128-
129134
width: 616px;
130135
height: 606px;
131136
}

0 commit comments

Comments
 (0)