Skip to content

Commit 1c30893

Browse files
committed
[fix] scroll 위치이동
1 parent 1d0e476 commit 1c30893

File tree

6 files changed

+25
-27
lines changed

6 files changed

+25
-27
lines changed

src/domains/main/components/3d/Landing.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import HomeModel from './HomeModel';
44
import HomeLogo from './HomeLogo';
55
import HomeText from './HomeText';
6-
import Scroll from './Scroll';
76
import { useEffect, useState } from 'react';
87
import ModelImage from './ModelImage';
98

@@ -30,7 +29,6 @@ function Landing({ setIsLoading, isDesktop }: Props) {
3029
<>
3130
<HomeLogo isDesktop={isDesktop} />
3231
<HomeText isDesktop={isDesktop} />
33-
<Scroll isDesktop={isDesktop} />
3432
</>
3533
)}
3634
</div>

src/domains/main/components/3d/Scroll.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import Lottie from 'lottie-react';
22
import scroll from '@/shared/assets/lottie/ScrollDownAnimation.json';
33

4-
function Scroll({ isDesktop }: { isDesktop: boolean }) {
5-
const style = !isDesktop
6-
? {
7-
width: 45,
8-
height: 45,
9-
}
10-
: {
11-
width: 60,
12-
height: 60,
13-
};
4+
function Scroll() {
5+
// const style = !isDesktop
6+
// ? {
7+
// width: 45,
8+
// height: 45,
9+
// }
10+
// : {
11+
// width: 60,
12+
// height: 60,
13+
// };
1414
return (
1515
<div className="absolute bottom-18 left-1/2 -translate-x-1/2 rounded-full bg-secondary/10 z-11 md:w-[60px] md:h-[60px] w-[45px] h-[45px]">
1616
<div className="z-11">
17-
<Lottie animationData={scroll} style={style} aria-hidden loop={true} />
17+
<Lottie animationData={scroll} aria-hidden loop={true} />
1818
</div>
1919
</div>
2020
);

src/domains/main/components/FinalLanding.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import gsap from 'gsap';
77
import { ScrollSmoother, ScrollTrigger } from 'gsap/all';
88
import StarMain from './3d/StarMain';
99
import CocktailDrop from '../cocktailDrop/CocktailDrop';
10+
import Scroll from './3d/Scroll';
1011

1112
function FinalLanding() {
1213
const [isLoading, setIsLoading] = useState(true);
@@ -86,6 +87,8 @@ function FinalLanding() {
8687
)}
8788
</div>
8889
)}
90+
91+
<Scroll />
8992
</div>
9093
);
9194
}

src/domains/main/components/mainSlide/components/pc/MainSlideAbv.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ function MainSlideAbv() {
4242

4343
return (
4444
<article className="slide-content invisible w-[61%] h-full bg-primary rounded-tl-[30px] rounded-bl-[30px] p-12 flex flex-col">
45-
<div className="flex flex-col gap-20 h-full">
45+
<div className="flex flex-col gap-[4%] h-full">
4646
<p className="text-[32px] font-bold ">3</p>
4747
<div className="flex flex-col gap-5 h-full justify-between">
4848
<header className="flex flex-col gap-10">
4949
<h2 className="text-5xl text-white font-bold">내 알콜도수 UP</h2>
50-
<p className="text-xl xl:text-2xl font-normal leading-[1.5]">
50+
<p className="text-xl leading-[1.5] font-normal text-white">
5151
5도 부터 시작하는 내 알콜도수 <br />내 참여에 따라 알콜도수 UP! <br />
5252
알콜도수에 따라 변하는 쑤리(SSURY)를 보는 재미도 있어요.
5353
</p>

src/domains/main/components/mainSlide/components/pc/MainSlideCommunity.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@ import Community02 from '@/shared/assets/images/community_02.webp';
55
function MainSlideCommunity() {
66
return (
77
<article className="slide-content invisible w-[71%] h-full p-12 bg-[#333333] rounded-tl-[30px] rounded-bl-[30px] flex flex-col ">
8-
<div className="flex flex-col gap-20 h-full">
8+
<div className="flex flex-col gap-[4%] h-full">
99
<p className="text-[32px] text-white font-bold">2</p>
1010
<div className="flex flex-col h-full justify-between">
1111
<header className="flex flex-col gap-10">
12-
<h2 className="text-5xl text-white font-bold">술술 즐기는, 커뮤니티</h2>
13-
<p className="text-xl pb-[250px] xl:text-2xl text-white font-normal leading-[1.5]">
14-
칵테일에 대해 물어볼 곳이 없어 목이 마른 당신! <br />
15-
초보자부터 애호가까지
12+
<h2 className="text-5xl text-white font-bold">함께 나누는 칵테일 이야기</h2>
13+
<p className="text-xl leading-[1.5] font-normal text-white">
14+
다양한 칵테일 레시피들을 SNS로 공유하고
1615
<br />
17-
Ssoul에서는 누구나 칵테일 이야기를 나눌 수 있어요.
18-
<br />
19-
회원들과 소통하면 내 칵테일 솜씨를 뽐내보세요.
16+
커뮤니티에서 누구나 칵테일 관련 이야기를 나눌 수 있어요.
2017
</p>
2118
</header>
22-
<div className="flex flex-col w-full gap-5" aria-hidden>
23-
<div className="relative w-full max-w-[13.75rem] rounded-2xl aspect-[0.96] overflow-hidden">
19+
<div className="flex flex-col w-full gap-5 mt-5" aria-hidden>
20+
<div className="relative w-[25%] rounded-2xl aspect-[0.96] overflow-hidden">
2421
<Image
2522
src={Community01}
2623
alt=""
@@ -29,7 +26,7 @@ function MainSlideCommunity() {
2926
className="object-contain object-left-bottom"
3027
/>
3128
</div>
32-
<div className="relative w-[90%] rounded-2xl aspect-[2.09] overflow-hidden">
29+
<div className="relative w-[70%] rounded-2xl aspect-[2.09] overflow-hidden">
3330
<Image
3431
src={Community02}
3532
alt=""

src/domains/main/components/mainSlide/components/pc/MainSlideTest.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const DUMMY_TEST = [
1616
function MainSlideTest() {
1717
return (
1818
<article className="slide-content invisible w-[80%] p-12 h-full bg-[#4D4D4D] rounded-tl-[30px] rounded-bl-[30px] flex flex-col">
19-
<div className="flex flex-col gap-20 h-full">
19+
<div className="flex flex-col gap-[4%] h-full">
2020
<p className="text-[32px] text-white font-bold">1</p>
2121
<div className="flex flex-col justify-between h-full">
2222
<header className="flex flex-col gap-10">

0 commit comments

Comments
 (0)