Skip to content

Home scoll fix #59

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
michelleyeoh merged 7 commits into from
Mar 1, 2026
Merged

Home scoll fix #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
572800d
moved social good hero to the right
michelleyeoh Mar 1, 2026
2101a3c
Merge branch 'main' of https://github.com/HackDavis/website-2026
michelleyeoh Mar 1, 2026
2d10fbc
update z index
michelleyeoh Mar 1, 2026
5511e9e
Merge branch 'main' into z-index-fix
michelleyeoh Mar 1, 2026
c2b6152
moved id
michelleyeoh Mar 1, 2026
986158a
Merge branch 'main' into home-scoll-fix
michelleyeoh Mar 1, 2026
28e9879
changed z index of couch and text
michelleyeoh Mar 1, 2026
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
14 changes: 7 additions & 7 deletions app/(pages)/(index-page)/_components/heroInfo/heroInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ export default function HeroInfo() {

return (
<div
id="home"
ref={containerRef}
className="flex flex-col pl-[9%] items-center -pl-5 p-5 w-full gap-6 md:flex-row md:items-stretch md:pr-[5%]"
>
<div
className="absolute -top-7 md:-top-24 left-[27%] md:left-[30%] -z-[-40]"
className="absolute -top-7 md:-top-24 left-[27%] md:left-[30%]"
// can't import getParallaxStyle here because it needs to spin at the same time
style={{
transform: `translateX(${
Expand All @@ -35,6 +34,7 @@ export default function HeroInfo() {
alt="green flower"
width={300}
height={300}
id="home" // scroll to this image when clicking "Home" in navbar (top-most item)
className="flex flex-row justify-center object-contain w-[40%] md:h-full md:w-full"
style={{ animation: 'spin 30s linear infinite' }}
/>
Expand All @@ -45,11 +45,11 @@ export default function HeroInfo() {
alt="watertower"
width={156.5}
height={221.27}
className="absolute top-29 left-27 z-[-40] hidden md:block"
className="absolute top-29 left-27 hidden md:block"
style={getParallaxStyle(mousePosition, bigShape)}
/>
<div
className="absolute z-[-40] top-[56%] md:top-[50%] left-[2%]"
className="absolute top-[56%] md:top-[50%] left-[2%]"
// can't import getParallaxStyle here because it needs to spin at the same time
style={{
transform: `translateX(${
Expand All @@ -71,12 +71,12 @@ export default function HeroInfo() {
alt="blue shape"
width={100}
height={100}
className="absolute order-2 md:order-none top-[85%] -left-[5%] md:left-[35%] justify-center -z-10 object-contain"
className="absolute order-2 md:order-none top-[85%] -left-[5%] md:left-[35%] justify-center object-contain"
style={getParallaxStyle(mousePosition, littleShape)}
/>
</div>
{/* animals on couch */}
<div className="order-2 md:order-none flex flex-row md:min-w-[360px] items-stretch gap-6">
<div className="order-2 md:order-none flex flex-row md:min-w-[360px] items-stretch gap-6 z-10">
<Image
src="/Images/reghero/Couch.svg"
alt="Animals on couch"
Expand All @@ -87,7 +87,7 @@ export default function HeroInfo() {
</div>

{/* right side */}
<div className="order-1 md:order-none flex w-full min-w-0 flex-col justify-between md:w-full md:pr-0 pr-[5%]">
<div className="order-1 md:order-none flex w-full min-w-0 flex-col justify-between md:w-full md:pr-0 pr-[5%] z-10">
{/* here text + buttons */}
<div className="flex flex-row justify-start items-start md:justify-end md:items-end">
<div className="flex flex-col items-start gap-[22px] text-left md:items-end md:gap-[31px] md:text-right">
Expand Down
2 changes: 1 addition & 1 deletion app/(pages)/(index-page)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Sponsers from './_components/Sponsers/Sponsers';

export default function Home() {
return (
<div className="pt-40 flex flex-col w-full min-h-screen">
<div className="pt-40 flex flex-col w-full min-h-screen bg-[#FAFAFA]">
<HeroInfo />
<TenYears />
<Stats />
Expand Down