Skip to content

Commit

Permalink
Merge pull request #375 from nwplus/hackcamp2023_info_events_transition
Browse files Browse the repository at this point in the history
fix info events transition cutoff
  • Loading branch information
meleongg authored Nov 7, 2023
2 parents 955c1fa + 0e60bd3 commit b381ebc
Show file tree
Hide file tree
Showing 6 changed files with 935 additions and 645 deletions.
Binary file modified public/assets/background/about/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
336 changes: 336 additions & 0 deletions public/assets/background/about/deer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/background/learn/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/mobile/about/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,216 changes: 577 additions & 639 deletions public/assets/mobile/events/background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 22 additions & 6 deletions src/sections/Info.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const InfoContainer = styled.div`
position: relative;
height: auto;
overflow: hidden;
z-index: 12;
overflow: visible;
z-index: 99;
width: 100%;
aspect-ratio: 1440 / 1100;
Expand Down Expand Up @@ -86,11 +86,11 @@ const PushinP = styled.p`

const fishingBearBob = keyframes`
0%, 100% {
transform: translateY(0, -2vw);
transform: translateY(0, 2vw);
}
50% {
transform: translateY(-1vw);
transform: translateY(1vw);
}
`

Expand All @@ -102,10 +102,11 @@ const FishingBear = styled.div`
background-position: bottom left;
position: absolute;
top: -2vw;
left 4.75vw;
top: 0vw;
left: 4vw;
width: 100%;
height: 100%;
z-index: 99;
${(p) => p.theme.mediaQueries.mobile} {
background-size: 67.5vw;
Expand All @@ -114,6 +115,20 @@ const FishingBear = styled.div`
}
`

const Deer = styled.div`
background: url('assets/background/about/deer.svg');
background-size: 37.5vw;
background-repeat: no-repeat;
background-position: bottom right;
position: absolute;
top: 21.5vw;
left: 11vw;
width: 100%;
height: 100%;
z-index: 99;
`

const Info = () => {
// const { ref: ref1 } = useParallax({
// speed: -30
Expand Down Expand Up @@ -146,6 +161,7 @@ const Info = () => {
</PushinP>
</TextContainer>
<FishingBear />
<Deer />
</InfoContainer>
)
}
Expand Down

0 comments on commit b381ebc

Please sign in to comment.