From 49cf71d79da66a2785198fc6b9cdfba93b2cd629 Mon Sep 17 00:00:00 2001
From: YearaChoi <22200750@handong.ac.kr>
Date: Tue, 6 Aug 2024 19:33:53 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=20=EB=A9=94=EC=9D=B8=ED=8E=98?=
=?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=97=A4=EB=8D=94=20width=20100%=20?=
=?UTF-8?q?=EB=B3=80=EA=B2=BD,=20=EB=B0=B0=EB=84=88=20=ED=81=AC=EA=B8=B0?=
=?UTF-8?q?=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/MainPage/BannerMain.jsx | 2 +-
src/components/MainPage/HeaderMain.jsx | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/MainPage/BannerMain.jsx b/src/components/MainPage/BannerMain.jsx
index e0d472e..c5e6a4e 100644
--- a/src/components/MainPage/BannerMain.jsx
+++ b/src/components/MainPage/BannerMain.jsx
@@ -91,7 +91,7 @@ const Wrapper = styled.div`
const BannerBg = styled.div`
background-image: url(${mainBannerImg});
- width: 108%;
+ width: 109%;
height: 118%;
background-size: cover;
background-position: left;
diff --git a/src/components/MainPage/HeaderMain.jsx b/src/components/MainPage/HeaderMain.jsx
index 763407a..37d40ef 100644
--- a/src/components/MainPage/HeaderMain.jsx
+++ b/src/components/MainPage/HeaderMain.jsx
@@ -124,12 +124,14 @@ function HeaderMain() {
export default HeaderMain;
const Wrapper = styled.div`
+ /* border: 1px solid red; */
height: 98px;
font-size: 20px;
display: flex;
justify-content: center;
position: absolute;
- width: 1440px;
+ width: 100%;
+ min-width: 1440px;
font-family: "PretendardRegular";
`;
From 2d76a038d62e5c07dd19deb955761451ddf40780 Mon Sep 17 00:00:00 2001
From: YearaChoi <22200750@handong.ac.kr>
Date: Tue, 6 Aug 2024 20:16:47 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=ED=8E=98=EC=9D=B4?=
=?UTF-8?q?=EC=A7=80=20=ED=95=84=ED=84=B0,=20=EA=B0=95=EC=A2=8C=20?=
=?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
=?UTF-8?q?=ED=95=84=ED=84=B0=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=80?=
=?UTF-8?q?=EA=B2=BD,=20=EC=A4=91=EC=95=99=20=EC=A0=95=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LectureListPage/ListAllContent.jsx | 4 +++
.../MainPage/FilterContainerMain.jsx | 33 ++++++++++++++++---
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/components/LectureListPage/ListAllContent.jsx b/src/components/LectureListPage/ListAllContent.jsx
index a89a94a..d56e00a 100644
--- a/src/components/LectureListPage/ListAllContent.jsx
+++ b/src/components/LectureListPage/ListAllContent.jsx
@@ -53,8 +53,12 @@ function LectureListContent() {
diff --git a/src/components/MainPage/FilterContainerMain.jsx b/src/components/MainPage/FilterContainerMain.jsx
index a0e3055..8ac905a 100644
--- a/src/components/MainPage/FilterContainerMain.jsx
+++ b/src/components/MainPage/FilterContainerMain.jsx
@@ -12,7 +12,15 @@ import { selectedDisabilityTypeState } from "../../atom";
import { selectedDateState } from "../../atom";
import { selectedPriceState } from "../../atom";
-function FilterContainerMain({ absolute = true, marginTop, marginLeft }) {
+function FilterContainerMain({
+ absolute = true,
+ marginTop,
+ marginLeft,
+ top,
+ left,
+ transform,
+ noPosition,
+}) {
const navigate = useNavigate();
const [checked, setChecked] = useState({
@@ -579,7 +587,15 @@ function FilterContainerMain({ absolute = true, marginTop, marginLeft }) {
};
return (
-
+
원하는 운동 강좌를 검색해보세요
@@ -774,13 +790,20 @@ const Wrapper = styled.div`
width: 1000px;
height: auto;
margin-top: ${(props) => props.marginTop || "320px"};
- margin-left: ${(props) => props.marginLeft || "220px"};
- /* left: 40%; */
- /* transform: translateX(-50%); */
+ /* margin-left: ${(props) => props.marginLeft || "220px"}; */
+ margin-left: ${(props) => props.marginLeft || "0px"};
background-color: white;
z-index: 10000;
border-radius: 10px;
padding-bottom: 28px;
+ // 조건부 스타일 적용
+ ${(props) =>
+ !props.noPosition &&
+ `
+ top: ${props.top || "15%"};
+ left: ${props.left || "50%"};
+ transform: translate(-50%, -50%);
+ `}
`;
const Container = styled.div`
From 215032e6e9d7d02f82c50aad395ad1d5faccf7cd Mon Sep 17 00:00:00 2001
From: YearaChoi <22200750@handong.ac.kr>
Date: Tue, 6 Aug 2024 20:19:03 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EA=B0=95=EA=B3=BC=20=EA=B2=80?=
=?UTF-8?q?=EC=83=89=EA=B2=B0=EA=B3=BC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
=?UTF-8?q?=ED=95=84=ED=84=B0=20=EC=A4=91=EC=95=99=20=EC=A0=95=EB=A0=AC,?=
=?UTF-8?q?=20=EC=83=81=EC=9C=84=EC=86=8D=EC=84=B1=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/LectureListPage/LectureListContent.jsx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/components/LectureListPage/LectureListContent.jsx b/src/components/LectureListPage/LectureListContent.jsx
index 1852274..3940453 100644
--- a/src/components/LectureListPage/LectureListContent.jsx
+++ b/src/components/LectureListPage/LectureListContent.jsx
@@ -53,8 +53,12 @@ function LectureListContent({ courses }) {