Skip to content

Commit

Permalink
Fix menu links and cansat background color change
Browse files Browse the repository at this point in the history
  • Loading branch information
@optimisan
optimisan committed Nov 10, 2022
1 parent 7f84ec0 commit 6e4773e
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 41 deletions.
22 changes: 16 additions & 6 deletions public/archangel/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,23 @@
>
<i class="fa-solid fa-xmark"></i>
</div>
<h2>Projects</h2>
<div class="divider"></div>
<a class="nav-ele" href="../sacup/">Rocket</a>
<a class="nav-ele" href="../cansat/">CanSat</a>
<a class="nav-ele" href="../cubesat/">CubeSat</a>
<a class="nav-ele" href="../archangel/">R&D</a>
<a class="nav-ele" href="/about">Who Are We</a>
<a class="nav-ele" href="/team">Team</a>
<a
onclick="document.getElementById('mobile-dropdown').classList.toggle('active')"
class="nav-ele mobile-projects"
href="#!"
>Projects</a
>
<div class="mobile-dropdown" id="mobile-dropdown">
<a class="nav-project" href="../sacup/">Rocket</a>
<a class="nav-project" href="../cansat/">CanSat</a>
<a class="nav-project" href="../cubesat/">CubeSat</a>
<a class="nav-project" href="../archangel/">R&D</a>
</div>
<a class="nav-ele" href="/sponsors">Sponsors</a>
<a class="nav-ele" href="/posts">Blog</a>
<a class="nav-ele" href="/contact">Contact</a>
</div>
<nav class="navbar row">
<i
Expand Down
26 changes: 20 additions & 6 deletions public/cansat/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,34 @@ images[0].onload = function () {
positionLabels();
};
function video1() {
const renderTimeline = gsap.timeline();
renderTimeline.to(airpods, {
frame: 80 - 1,//frameCount - 1,
snap: "frame",
ease: "none",
const renderTimeline = gsap.timeline({
scrollTrigger: {
scrub: 0.8,
trigger: "#s1",
start: "top-=100px bottom",
end: "bottom bottom",
onEnter: positionLabels,
},
}
});
renderTimeline.to(airpods, {
frame: 80 - 1,//frameCount - 1,
snap: "frame",
ease: "none",
// scrollTrigger: {
// scrub: 0.8,
// trigger: "#s1",
// start: "top-=100px bottom",
// end: "bottom bottom",
// onEnter: positionLabels,
// },
onUpdate: render, // use animation onUpdate instead of scrollTrigger's onUpdate
})
.fromTo("body", {
backgroundColor: "#000",
duration: 0.02
}, {
backgroundColor: "#b8b8b8",
}, 0.24)
return renderTimeline;
}
function videoResume(startFrame, endFrame, trigger) {
Expand Down
2 changes: 1 addition & 1 deletion public/contact/contact.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ button:hover {
}

.contact__main-header {
font-size: 1.3em;
font-size: 1.6em;
margin-top: 0.7em;
font-weight: 600;
text-align: center;
Expand Down
62 changes: 43 additions & 19 deletions public/contact/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,23 @@
<meta name="msapplication-TileColor" content="#ffffff" />
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png" />
<meta name="theme-color" content="#ffffff" />
<link rel="stylesheet" href="../css/style.css" />

<style>
@import url("https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css");

.container {
width: unset;
display: revert;
}
html {
font-size: 100%;
}
a.nav-project {
font-size: 18px !important;
}
h1 {
font-size: calc(1.375rem + 1.5vw) !important;
}
/* Menu mobile */
.menu {
position: fixed;
Expand Down Expand Up @@ -124,24 +138,24 @@
/* ===== Scrollbar CSS ===== */
/* Firefox */
/* * {
scrollbar-width: thin;
scrollbar-color: #ffffff #121212;
}
scrollbar-width: thin;
scrollbar-color: #ffffff #121212;
}
/* Chrome, Edge, and Safari */
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 10px;
}
/*
*::-webkit-scrollbar-track {
background: #121212;
}
*::-webkit-scrollbar-track {
background: #121212;
}
*::-webkit-scrollbar-thumb {
background-color: #ffffff;
border-radius: 10px;
border: 3px solid #ffffff;
} */
*::-webkit-scrollbar-thumb {
background-color: #ffffff;
border-radius: 10px;
border: 3px solid #ffffff;
} */
::-webkit-scrollbar {
width: 10px;
height: 10px;
Expand Down Expand Up @@ -261,13 +275,23 @@
>
<i class="fa-solid fa-xmark"></i>
</div>
<h2>Projects</h2>
<div class="divider"></div>
<a class="nav-ele" href="../sacup/">Rocket</a>
<a class="nav-ele" href="../cansat/">CanSat</a>
<a class="nav-ele" href="../cubesat/">CubeSat</a>
<a class="nav-ele" href="../archangel/">R&D</a>
<a class="nav-ele" href="/about">Who Are We</a>
<a class="nav-ele" href="/team">Team</a>
<a
onclick="document.getElementById('mobile-dropdown').classList.toggle('active')"
class="nav-ele mobile-projects"
href="#!"
>Projects</a
>
<div class="mobile-dropdown" id="mobile-dropdown">
<a class="nav-project" href="../sacup/">Rocket</a>
<a class="nav-project" href="../cansat/">CanSat</a>
<a class="nav-project" href="../cubesat/">CubeSat</a>
<a class="nav-project" href="../archangel/">R&D</a>
</div>
<a class="nav-ele" href="/sponsors">Sponsors</a>
<a class="nav-ele" href="/posts">Blog</a>
<a class="nav-ele" href="/contact">Contact</a>
</div>
<nav class="navbar1">
<i
Expand Down
3 changes: 2 additions & 1 deletion public/css/scroll.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.mouse-scroll {
position: fixed;
z-index: 100;
bottom: 10px;
left: 0;
width: 100%;
Expand All @@ -26,7 +27,7 @@
animation: arrScroll 1.8s ease-out infinite;
animation-delay: 0.2s;
}
.mouse.reverse::before {
.up .mouse::before {
animation: arrScroll 2s ease-out infinite reverse;
}
@keyframes arrScroll {
Expand Down
22 changes: 16 additions & 6 deletions public/cubesat/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,23 @@
>
<i class="fa-solid fa-xmark"></i>
</div>
<h2>Projects</h2>
<div class="divider"></div>
<a class="nav-ele" href="../sacup/">Rocket</a>
<a class="nav-ele" href="../cansat/">CanSat</a>
<a class="nav-ele" href="../cubesat/">CubeSat</a>
<a class="nav-ele" href="../archangel/">R&D</a>
<a class="nav-ele" href="/about">Who Are We</a>
<a class="nav-ele" href="/team">Team</a>
<a
onclick="document.getElementById('mobile-dropdown').classList.toggle('active')"
class="nav-ele mobile-projects"
href="#!"
>Projects</a
>
<div class="mobile-dropdown" id="mobile-dropdown">
<a class="nav-project" href="../sacup/">Rocket</a>
<a class="nav-project" href="../cansat/">CanSat</a>
<a class="nav-project" href="../cubesat/">CubeSat</a>
<a class="nav-project" href="../archangel/">R&D</a>
</div>
<a class="nav-ele" href="/sponsors">Sponsors</a>
<a class="nav-ele" href="/posts">Blog</a>
<a class="nav-ele" href="/contact">Contact</a>
</div>
<nav class="navbar row">
<i
Expand Down
14 changes: 12 additions & 2 deletions public/sacup/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,20 @@
>
<i class="fa-solid fa-xmark"></i>
</div>
<h2>Projects</h2>
<div class="divider"></div>
<a class="nav-ele" href="/about">Who Are We</a>
<a class="nav-ele" href="/team">Team</a>
<a
onclick="document.getElementById('mobile-dropdown').classList.toggle('active')"
class="nav-ele mobile-projects"
href="#!"
>Projects</a
>
<div class="mobile-dropdown" id="mobile-dropdown">
<a class="nav-project" href="../sacup/">Rocket</a>
<a class="nav-project" href="../cansat/">CanSat</a>
<a class="nav-project" href="../cubesat/">CubeSat</a>
<a class="nav-project" href="../archangel/">R&D</a>
</div>
<a class="nav-ele" href="/sponsors">Sponsors</a>
<a class="nav-ele" href="/posts">Blog</a>
<a class="nav-ele" href="/contact">Contact</a>
Expand Down

2 comments on commit 6e4773e

@vercel
Copy link

@vercel vercel bot commented on 6e4773e Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

seds – ./

seds-akshat-oke.vercel.app
seds-git-main-akshat-oke.vercel.app
seds-six.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 6e4773e Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

seds-with-blog – ./

seds-with-blog-git-main-akshat-oke.vercel.app
seds-bphc.vercel.app
seds-with-blog-akshat-oke.vercel.app

Please sign in to comment.