From 7e4ef8827f7757a1da8a8803d3018c4c92cf58d9 Mon Sep 17 00:00:00 2001 From: SangHun Kwon Date: Mon, 20 May 2024 17:15:30 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B0=98=EC=9D=91=ED=98=95=20?= =?UTF-8?q?=EB=B3=80=ED=99=98=201=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1차 수정 --- src/styles/LoginPage.module.css | 78 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/styles/LoginPage.module.css b/src/styles/LoginPage.module.css index 60a6a11..794cfb8 100644 --- a/src/styles/LoginPage.module.css +++ b/src/styles/LoginPage.module.css @@ -10,7 +10,7 @@ } .page { - margin-top: 141px; + margin-top: 14.462vh; display: flex; flex-direction: column; justify-content: center; @@ -19,7 +19,7 @@ .blurpage { filter: blur(5px); - margin-top: 141px; + margin-top: 14.462vh; display: flex; flex-direction: column; justify-content: center; @@ -32,33 +32,33 @@ } .titleWrap { - margin-top: 38px; + margin-top: 3.897vh; color: #626262; font-family: "NanumSquareRoundOTF"; - font-size: 25px; + font-size: 2.564vh; justify-content: center; font-weight: 800; - margin-bottom: 40px; + margin-bottom: 4.103vh; } .margin1 { - margin-bottom: 20px; + margin-bottom: 2.051vh; } .margin2 { - margin-bottom: 23px; + margin-bottom: 2.359vh; } .btnGoogle { - gap: 10px; + gap: 1.026vh; box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px; border: none; background-color: #ffffff; - width: 380px; - height: 50px; + width: 19.792vw; + height: 5.128vh; border-radius: 20px; font-family: "NanumSquareRoundOTF"; - font-size: 15px; + font-size: 1.538vh; font-weight: bold; display: flex; justify-content: center; @@ -67,15 +67,15 @@ } .btnKakao { - gap: 10px; + gap: 1.26vh; box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px; border: none; - width: 380px; + width: 19.792vw; background-color: #fee500; - height: 50px; + height: 5.128vh; border-radius: 20px; font-family: "NanumSquareRoundOTF"; - font-size: 15px; + font-size: 1.538vh; font-weight: bold; display: flex; justify-content: center; @@ -90,41 +90,41 @@ .inputWrap { display: flex; flex-direction: row; - margin-bottom: 17px; + margin-bottom: 1.744vh; } .inputTitle { - gap: 8px; + gap: 0.821vh; width: 100%; display: flex; justify-content: center; align-items: center; font-family: "NanumSquareRoundOTF"; - font-size: 15px; + font-size: 1.538vh; font-weight: bold; } .textEP1 { - padding-left: 10px; + padding-left: 0.521vw; font-weight: bold; font-family: "NanumSquareRoundOTF"; - font-size: 15px; + font-size: 1.538vh; border: 1px solid #b2b2b2; - width: 370px; - height: 41px; - margin-right: 55px; + width: 19.271vw; + height: 4.205vh; + margin-right: 2.865vw; border-radius: 20px; } .textEP2 { - padding-left: 10px; + padding-left: 0.521vw; font-family: "NanumSquareRoundOTF"; font-weight: bold; - font-size: 15px; + font-size: 1.538vh; border: 1px solid #b2b2b2; - width: 370px; - height: 41px; - margin-right: 70px; + width: 19.271vw; + height: 4.205vh; + margin-right: 3.646vw; border-radius: 20px; } @@ -132,26 +132,26 @@ box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px; border: none; border: none; - width: 380px; - height: 50px; + width: 19.792vw; + height: 5.128vh; border-radius: 20px; background-color: #ffd439; - margin-bottom: 5%; + margin-bottom: 5vh; font-family: "NanumSquareRoundOTF"; - font-size: 15px; + font-size: 1.538vh; font-weight: bold; cursor: pointer; } .bottomText1 { - gap: 10px; + gap: 0.521vw; text-align: center; justify-content: center; display: flex; font-family: "NanumSquareRoundOTF"; font-style: normal; font-weight: 800; - font-size: 12px; + font-size: 1.231vh; line-height: 160%; /* or 19px */ @@ -159,8 +159,8 @@ } .bottomText2 { - margin-top: 3px; - gap: 10px; + margin-top: 0.308vh; + gap: 0.521vw; text-align: center; justify-content: center; display: flex; @@ -168,19 +168,19 @@ font-family: "NanumSquareRoundOTF"; font-style: normal; font-weight: 800; - font-size: 12px; + font-size: 1.231vh; line-height: 160%; /* or 19px */ color: #bbbbbb; - padding-right: 40px; + padding-right: 2.083vw; } .bottomfont { font-family: "NanumSquareRoundOTF"; font-style: normal; font-weight: 800; - font-size: 13px; + font-size: 1.333vh; line-height: 160%; cursor: default; /* or 21px */ From e478147efb4f274f079927b44d353099efc45f29 Mon Sep 17 00:00:00 2001 From: SangHun Kwon Date: Mon, 20 May 2024 17:47:12 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20last=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 로고들 크기, horizon line 수정 --- src/styles/LoginPage.module.css | 2 ++ src/views/page/LoginPage/HorizontalLine.js | 16 +++++++++++++--- src/views/page/LoginPage/LoginPage.js | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/styles/LoginPage.module.css b/src/styles/LoginPage.module.css index 794cfb8..e0a4e2f 100644 --- a/src/styles/LoginPage.module.css +++ b/src/styles/LoginPage.module.css @@ -29,6 +29,8 @@ .logo { cursor: pointer; + width: 18vw; + height: auto; } .titleWrap { diff --git a/src/views/page/LoginPage/HorizontalLine.js b/src/views/page/LoginPage/HorizontalLine.js index 30b3a60..1e6af48 100644 --- a/src/views/page/LoginPage/HorizontalLine.js +++ b/src/views/page/LoginPage/HorizontalLine.js @@ -4,14 +4,24 @@ const HorizonLine = ({ text }) => { return (
- {text} + {text}
); }; diff --git a/src/views/page/LoginPage/LoginPage.js b/src/views/page/LoginPage/LoginPage.js index 2003558..aef6f12 100644 --- a/src/views/page/LoginPage/LoginPage.js +++ b/src/views/page/LoginPage/LoginPage.js @@ -109,13 +109,13 @@ function Home() {
From 08b0a54b0b84df689db3d81611b95b6a30401ce5 Mon Sep 17 00:00:00 2001 From: SangHun Kwon Date: Mon, 20 May 2024 18:03:04 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 마이페이지 전체적인 배치, 크기 조정 --- src/styles/Mypage.module.css | 6 +++--- src/views/page/MyPage/MyPage.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/styles/Mypage.module.css b/src/styles/Mypage.module.css index e606445..5fae428 100644 --- a/src/styles/Mypage.module.css +++ b/src/styles/Mypage.module.css @@ -25,7 +25,7 @@ overflow-y: hidden; display: flex; flex-direction: column; - width: 729px; + width: 820px; height: 540px; background: rgba(245, 245, 245, 0.5); border-radius: 60px; @@ -33,7 +33,6 @@ } .scrollbar_Y { - width: 729px; overflow-y: scroll; } @@ -226,10 +225,11 @@ margin-top: 118px; margin-right: 70px; border-left: 1px solid #ffffff; - height: 721px; + height: 820px; } .informationDiv { + margin-left: 130px; margin-top: 100px; height: 800px; width: 640px; diff --git a/src/views/page/MyPage/MyPage.js b/src/views/page/MyPage/MyPage.js index e2f2956..0e305a3 100644 --- a/src/views/page/MyPage/MyPage.js +++ b/src/views/page/MyPage/MyPage.js @@ -288,7 +288,7 @@ function MyPage() {
Date: Mon, 20 May 2024 18:12:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85,?= =?UTF-8?q?=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 마이페이지 배경 크기, 범위 조정 회원가입 조정 --- src/styles/Mypage.module.css | 2 ++ src/styles/Signup.module.css | 2 ++ src/views/page/MyPage/MyPage.js | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/styles/Mypage.module.css b/src/styles/Mypage.module.css index 5fae428..8491f85 100644 --- a/src/styles/Mypage.module.css +++ b/src/styles/Mypage.module.css @@ -4,6 +4,8 @@ } .blurpage { + width: 100%; + height: 100%; filter: blur(5px); display: flex; overflow: hidden; diff --git a/src/styles/Signup.module.css b/src/styles/Signup.module.css index 8fa1117..a5a0bcb 100644 --- a/src/styles/Signup.module.css +++ b/src/styles/Signup.module.css @@ -32,6 +32,8 @@ } .logo { + width: 350px; + height: auto; cursor: pointer; } diff --git a/src/views/page/MyPage/MyPage.js b/src/views/page/MyPage/MyPage.js index 0e305a3..97a38e4 100644 --- a/src/views/page/MyPage/MyPage.js +++ b/src/views/page/MyPage/MyPage.js @@ -279,8 +279,9 @@ function MyPage() { src={background} style={{ position: "fixed", - width: window.innerWidth, - height: window.innerHeight, + width: "100%", + height: "100%", + overflow:"hidden", objectFit: "cover", zIndex: -1, }}