Skip to content

Master #57

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
Chet-69 merged 2 commits into from
Apr 22, 2025
Merged

Master #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9fdbdc
gsap in main
Chet-69 Apr 22, 2025
001ac2e
Merge branch 'main' of https://github.com/Chet-69/SCM_Project
Chet-69 Apr 22, 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
8 changes: 3 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<video autoplay loop muted src="pictures/bg_video.mp4"></video>
<div>
<div id="nav"></div>
<div id="main"></div>

<div id="main">
<!-- page1 -->
Expand Down Expand Up @@ -99,12 +100,9 @@ <h2>BMI Calculator</h2>
</div>
</div>
</div>
</div>

<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.12.2/gsap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.12.2/ScrollTrigger.min.js"></script>

<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@emailjs/browser@4/dist/email.min.js">
</script> -->

<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.12.5/gsap.min.js"
integrity="sha512-7eHRwcbYkK4d9g/6tD/mhkf++eoTHwpNM9woBxtPUBWm67zeAfFC+HrdoE2GanKeocly/VxeLvIqwvCdk7qScg=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
Expand Down
11 changes: 0 additions & 11 deletions navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,3 @@ gsap.to("#nav", {
}

})
gsap.to("#main", {
backgroundColor: "#000",
scrollTrigger: {
trigger: "main",
scroller: "body",
// markers:true
start: "top -25%",
end: "top -75%",
scrub: 2
}
})
17 changes: 9 additions & 8 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,18 @@ gsap.to("#nav", {
}

})

gsap.to("#main", {
backgroundColor: "#000",
scrollTrigger: {
trigger: "main",
scroller: "body",
// markers:true
start: "top -25%",
end: "top -75%",
scrub: 2
}
})
trigger: "#main",
scroller: "body",
// markers: true,
start: "top -25%",
end: "top -70%",
scrub: 2,
},
});

// page 2

Expand Down
5 changes: 5 additions & 0 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ video {
animation: outlineAnimation 5s infinite ease-in-out;
}

#main {
position: relative;
background-color: rgba(0, 0, 0, 0.39);
}

.main main{
width:100%;
height:calc(100% - 280px);
Expand Down