Skip to content

Commit 37a4898

Browse files
Merge pull request #12 from sudarshanmaan/adjusting_fontsize
Adjusting fontsize, key animations, ignoring eslintcache
2 parents ba30f9e + c996ec8 commit 37a4898

13 files changed

Lines changed: 57 additions & 19 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,4 @@ GitHub.sublime-settings
159159

160160
# React #
161161
frontend/node_modules
162+
frontend/.eslintcache

frontend/.eslintcache

Lines changed: 0 additions & 1 deletion
This file was deleted.

frontend/public/bitbyte-2.png

157 KB
Loading

frontend/public/bitbyte.png

17.1 KB
Loading

frontend/public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
5+
<link rel="icon" href="./bitbyte.png" />
66
<link rel="preconnect" href="https://fonts.gstatic.com">
77
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;600;900&display=swap" rel="stylesheet">
88
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -26,7 +26,7 @@
2626
work correctly both with client-side routing and a non-root public URL.
2727
Learn how to configure a non-root public URL by running `npm run build`.
2828
-->
29-
<title>React App</title>
29+
<title>The Programming Club IIITDMJ</title>
3030
</head>
3131
<body>
3232
<noscript>You need to enable JavaScript to run this app.</noscript>

frontend/src/components/homeNav/style.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@
3939
}
4040
.vector {
4141
width: 80%;
42+
z-index: 2;
4243
}
4344
}

frontend/src/components/homePage/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function HomePage() {
88
<div className={styles.home}>
99
<div className={styles.container}>
1010
<span className={styles.heading}>The Programming Club IIITDMJ</span>
11-
<img src="./ComponentTMP_0-image.png" alt="The Programming Club"/>
11+
<img className={styles.computer} src="./ComponentTMP_0-image.png" alt="The Programming Club"/>
1212
<span className={styles.text}>An Open Coding Community to explore and do a lot more with your friends and members.</span>
1313
<button className={styles.primaryBtn}>Explore Now</button>
1414
<SvgBackground />

frontend/src/components/homePage/style.module.css

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
letter-spacing: 0px;
2020
color: var(--heading-color);
2121
z-index: 3;
22+
animation: headingAnimation 1s forwards 0s ease-out;
2223
}
2324
.text {
2425
color: white;
@@ -36,6 +37,38 @@
3637
height: 5vh;
3738
cursor: pointer;
3839
font-size: 1.1rem;
40+
z-index: 5;
41+
}
42+
43+
.primaryBtn:focus {
44+
border: none;
45+
outline: none;
46+
}
47+
48+
.computer{
49+
animation: computerAnimation 1s forwards 0s ease-out;
50+
}
51+
52+
@keyframes computerAnimation{
53+
0%{
54+
transform: rotate(0) scale(0.75) translateY(-20%);
55+
opacity: 0;
56+
}
57+
100%{
58+
transform: rotate(0) scale(1) translateY(0);
59+
opacity: 1;
60+
}
61+
}
62+
63+
@keyframes headingAnimation{
64+
0%{
65+
transform: rotate(0) translateY(-35%);
66+
opacity: 0;
67+
}
68+
100%{
69+
transform: rotate(0) translateY(0);
70+
opacity: 1;
71+
}
3972
}
4073

4174
@media only screen and (max-width: 1080px) {
@@ -59,6 +92,6 @@
5992
width: 70%;
6093
}
6194
.text {
62-
font-size: 1rem;
95+
font-size: 0.8rem;
6396
}
6497
}

frontend/src/components/nav/style.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
background: #14335f;
2626
height: 100vh;
2727
width: 100vw;
28-
z-index: 4;
28+
z-index: 6;
2929
color: white;
3030
list-style: none;
3131
display: flex;

frontend/src/components/navLinks/index.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ import { Link } from 'react-router-dom';
55
function NavLinks() {
66
return (
77
<>
8-
<Link to=''>
8+
<Link to='' className={styles.Link}>
99
<li className={styles.first}>Club Registrations</li>
1010
</Link>
11-
<Link to=''>
11+
<Link to='' className={styles.Link}>
1212
<li className={styles.sec}>Leaderboard</li>
1313
</Link>
14-
<Link to=''>
14+
<Link to='' className={styles.Link}>
1515
<li className={styles.third}>Events</li>
1616
</Link>
17-
<Link to=''>
17+
<Link to='' className={styles.Link}>
1818
<li className={styles.fourth}>Sessions</li>
1919
</Link>
20-
<Link to=''>
20+
<Link to='' className={styles.Link}>
2121
<li className={styles.fifth}>Domains</li>
2222
</Link>
23-
<Link to=''>
23+
<Link to='' className={styles.Link}>
2424
<li className={styles.sixth}>Projects</li>
2525
</Link>
2626
</>

0 commit comments

Comments
 (0)