Skip to content
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

Jump to bottom

Dev #37

Merged
merged 6 commits into from
Oct 15, 2024
Merged

Dev #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0915a2d
ui bugs fix
barnilsarma Oct 15, 2024
508292e
windshield little displaced
barnilsarma Oct 15, 2024
98af809
windshield fix
barnilsarma Oct 15, 2024
8c48d17
Merge pull request #36 from gdsc-nits-org/minor_fixes
barnilsarma Oct 15, 2024
e820b88
fixes
barnilsarma Oct 15, 2024
7b83048
Merge pull request #38 from gdsc-nits-org/minor_fixes
barnilsarma Oct 15, 2024
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
10 changes: 6 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
<title>NITS HACKS 7.0</title>
<script async src="https://www.googletagmanager.com/gtag/js?id=G-VVX3QJCVSM"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-VVX3QJCVSM');
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag("js", new Date());
gtag("config", "G-VVX3QJCVSM");
</script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Hero/Hero.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const ControlStation = (props) => {
</div>
</div>
<Link to="about" className={styles.lowerRow}>
<button className={styles.proceed} onMouseEnter={playm}>
<button className={styles.proceed} onClick={playm}>
proceed
</button>
</Link>
Expand Down
40 changes: 26 additions & 14 deletions src/Components/Hero/Hero.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
top: 10rem;
}

scale: 0.2;
scale: 0.1;

@media screen and (min-width: 720px) {
scale: 0.5;
scale: 0.3;
}

left: -80vw;
Expand Down Expand Up @@ -707,7 +707,12 @@
.proceed {
font-size: 0.5rem;
background-color: #ff0000;
color: #ffff00;
color: #ffffff;
transition-duration: 0.5s;
&:hover {
color: #ffff00;
transition-duration: 0.5s;
}
font-family: "StarJedi", sans-serif;
border: none;
border-radius: 2px;
Expand All @@ -722,11 +727,14 @@

.windshield {
position: absolute;
bottom: 0;
bottom: 0.5rem;
min-height: 80%;
border: 0 solid transparent;
border-radius: 80%;
width: 50%;
width: 70%;
@media screen and (min-width: 495px) {
width: 50%;
}
display: flex;
flex-direction: column;
align-items: center;
Expand Down Expand Up @@ -757,28 +765,32 @@
justify-content: center;

.logo {
width: 70%;
height: 70%;
width: 50%;
height: 50%;

@media screen and (min-width: 495px) {
width: 30%;
height: 30%;
}

@media screen and (min-width: 600px) {
width: 30%;
height: 30%;
@media screen and (min-width: 700px) {
width: 32%;
height: 32%;
}

@media screen and (min-width: 760px) {
width: 20%;
height: 20%;
@media screen and (min-width: 720px) {
width: 25%;
height: 25%;
}

@media screen and (min-width: 850px) {
width: 30%;
height: 30%;
}
@media screen and (min-width: 1237px) {
width: 32%;
height: 32%;
}
}
}

Expand Down Expand Up @@ -905,7 +917,7 @@
align-items: center;
justify-content: space-around;
flex-direction: row;
width: 100%;
width: 70%;

@media screen and (min-width: 555px) {
width: 90%;
Expand Down
30 changes: 25 additions & 5 deletions src/Components/Navbar/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ const Navbar = () => {
<button
className={styles.deskNav}
onClick={() => {
audio.play();
if (location.pathname !== "/") {
navigate("/");
} else {
Expand All @@ -92,6 +91,11 @@ const Navbar = () => {
});
}
}}
onMouseOver={() => {
audio.play();
}}
onFocus={() => audio.play()}
onBlur={() => audio.pause()}
>
<p>Home</p>
<img alt="glow" src="/images/underscore.svg" className="underscore" />
Expand All @@ -101,9 +105,13 @@ const Navbar = () => {
<button
className={styles.deskNav}
onClick={() => {
audio.play();
navigate("/#events");
}}
onMouseOver={() => {
audio.play();
}}
onFocus={() => audio.play()}
onBlur={() => audio.pause()}
>
<p>events</p>
<img alt="glow" src="/images/underscore.svg" className="underscore" />
Expand All @@ -113,9 +121,13 @@ const Navbar = () => {
<button
className={styles.deskNav}
onClick={() => {
audio.play();
navigate("/faq");
}}
onMouseOver={() => {
audio.play();
}}
onFocus={() => audio.play()}
onBlur={() => audio.pause()}
>
<p>Faq</p>
<img alt="glow" src="/images/underscore.svg" className="underscore" />
Expand All @@ -125,9 +137,13 @@ const Navbar = () => {
<button
className={styles.deskNav}
onClick={() => {
audio.play();
navigate("/#sponsors");
}}
onMouseOver={() => {
audio.play();
}}
onFocus={() => audio.play()}
onBlur={() => audio.pause()}
>
<p>SponsorS</p>
<img alt="glow" src="/images/underscore.svg" className="underscore" />
Expand All @@ -137,9 +153,13 @@ const Navbar = () => {
<button
className={styles.deskNav}
onClick={() => {
audio.play();
navigate("/team");
}}
onMouseOver={() => {
audio.play();
}}
onFocus={() => audio.play()}
onBlur={() => audio.pause()}
>
<p>team</p>
<img alt="glow" src="/images/underscore.svg" className="underscore" />
Expand Down
4 changes: 3 additions & 1 deletion src/Components/Preview/Preview.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@

.glow_container {
border: 0.4rem solid white;
box-shadow: 1px 2px 3px 0.2rem #12deed;
box-shadow:
1px 2px 0.5rem 0.5rem #12deed6d,
1px 2px 0.5rem 0.5rem #12deed6d inset;
width: 100%;
height: 100%;
display: flex;
Expand Down
Loading