Skip to content

Updated Underwater Section According to Des Meeting #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JayJ104 merged 2 commits into from
Feb 15, 2025
Merged

Updated Underwater Section According to Des Meeting #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18b96bf
Adding bobbing animation to bunny and moved assets to left for all sc…
haylietan Feb 13, 2025
ff387ad
Merge branch 'main' into fix/underwater
JayJ104 Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 61 additions & 28 deletions app/(pages)/_components/Underwater/Underwater.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

.container {
background-color: var(--sea-background);
padding-left: 12%;
padding-left: 5%;
padding-bottom: 15%;
padding-top: 10%;
display: flex;
Expand All @@ -31,9 +31,11 @@

.musicContainer {
left: 0%;
padding-left: 10%;
padding-right: 10%;
padding-bottom: 35%;
// border: 3px solid black;
// padding-left: 10%;
padding-right: 0%;
padding-bottom: 55%;
margin-right: -5%;
top: 0%;
display: flex;
align-items: flex;
Expand Down Expand Up @@ -69,11 +71,13 @@

.bunnyContainer {
display: flex;

.bunny {
width: 100%;
padding-right: 5%;
padding-top: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}
}
Expand All @@ -88,15 +92,17 @@

.bunny {
width: 100%;
padding-right: 10%;
padding-right: 5%;
padding-top: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}

}

.textcontainer {
padding: 10% 10% 5% 0%;
padding: 10% 5% 5% 2%;
width: 40%;
flex-direction: column;
z-index: 1;
Expand Down Expand Up @@ -142,7 +148,7 @@

.container {
background-color: var(--sea-background);
padding-left: 12%;
padding-left: 8%;
padding-bottom: 15%;
padding-top: 10%;
display: flex;
Expand All @@ -155,10 +161,7 @@


.musicContainer {
left: 0%;
padding-left: 10%;
padding-right: 10%;
padding-bottom: 35%;
padding-bottom: 60%;
top: 0%;
display: flex;
align-items: flex;
Expand Down Expand Up @@ -199,6 +202,8 @@
width: 100%;
padding-right: 5%;
padding-top: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}
}
Expand All @@ -213,8 +218,10 @@

.bunny {
width: 100%;
padding-right: 10%;
padding-right: 5%;
padding-top: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}

Expand Down Expand Up @@ -308,6 +315,19 @@
}
}

// Move keyframes outside of .bunny
@keyframes bunnyBob {
0% {
transform: translate(-12%, 8%);
}
50% {
transform: translate(-12%, calc(8% + 20px));
}
100% {
transform: translate(-12%, 8%);
}
}

/* Adding delays to each ray for staggered animation */
.note:nth-child(1) { animation-delay: 0s; }
.note:nth-child(2) { animation-delay: 0.5s; }
Expand All @@ -319,7 +339,7 @@
@include sm-desktop {
.container {
background-color: var(--sea-background);
padding-left: 12%;
padding-left: 5%;
padding-bottom: 20%;
display: flex;
align-items: center;
Expand All @@ -336,6 +356,8 @@
width: 100%;
padding-right: 5%;
padding-top: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}

Expand All @@ -349,16 +371,18 @@

.bunny {
width: 100%;
padding-right: 10%;
padding-right: 5%;
padding-top: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}

}

.textcontainer {
padding: 10% 10% 5% 0%;
width: 40%;
width: 50%;
flex-direction: column;
z-index: 1;

Expand Down Expand Up @@ -421,29 +445,33 @@
.imagecontainer {

.musicContainer {
padding-right: 2%;
top: 0%;
padding-left: 5%;
display: flex;
align-items: flex;
justify-content: flex;
z-index: 1;
gap: 2%;
}

.bunny {
position: relative;
z-index: 1;
width: 100%;
padding-top: 5%;
// padding-right: 5%;
padding-left: 5%;

.bunnyContainer{
.bunny {
position: relative;
z-index: 1;
width: 100%;
padding-top: 5%;
padding-right: 15%;
padding-left: 5%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}
}

.textcontainer {
// border: 3px white solid;
padding: 10% 5% 0% 0%;
width: 40%;
width: 50%;
flex-direction: column;
z-index: 1;

Expand Down Expand Up @@ -506,9 +534,12 @@
flex-direction: column;

.bunny {
margin-top: -15%;
width: 100%;
padding: 20% 0% 20% 20%;
// margin-left: 10%;
padding: 0% 0% 35% 20%;
margin-left: 20%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}

Expand Down Expand Up @@ -619,6 +650,8 @@
width: 100%;
padding: 5% 0% 0% 5%;
// margin-left: 10%;
animation: bunnyBob 4s infinite alternate ease-in-out;
animation-delay: 0.0s;
}
}

Expand Down