Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 6 deletions components/button/Button.module.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
.rippleButton {
/* @apply text-lg inline-block overflow-hidden relative rounded-full px-10 py-[13px] cursor-pointer; */
@apply text-lg inline-block overflow-hidden relative px-10 py-[13px] cursor-pointer;
@apply text-lg inline-block overflow-hidden relative rounded-full px-10 py-[13px] cursor-pointer;
border: 1px solid rgba(255, 255, 255, 0.2);
transition: border-color 0.4s;
border-radius: 10px;
/* background: linear-gradient(90.28deg, #ffed79 1.18%, #ffa776 98.69%); */
}

.rippleButton::before {
Expand All @@ -17,9 +14,8 @@
height: 0;
border-radius: 50%;
background: rgb(51, 121, 238);
background: radial-gradient(circle, #ffed79 1.18%, #ffa776 98.69%);
background: radial-gradient(circle, rgba(51, 121, 238, 1) 0%, rgba(36, 172, 255, 1) 100%);
transition: width 0.5s, height 0.5s;
/* background: linear-gradient(90.28deg, #ffed79 1.18%, #ffa776 98.69%); */
}

.rippleButton:hover {
Expand Down
2 changes: 1 addition & 1 deletion components/footer/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Footer() {
<div className="flex-4 md:flex-1 sm:mt-8">
<h3 className="text-2xl">Get Help</h3>
<a
href="https://forms.gle/bGAauorD4Vj752z68"
href="https://docs.google.com/forms/d/1eOZsO1X6qmqyS48nEw43RJnOhwEBuAvXpXZXMtOOLaY/closedform"
className="block pl-1 text-lg my-1 font-extralight"
target="_blank"
rel="noreferrer"
Expand Down
11 changes: 6 additions & 5 deletions components/navbar/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import { HiMenuAlt4 } from 'react-icons/hi';
import Image from 'next/image';
import Link from 'next/link';
import styles from './Navbar.module.css';
// import Logo from '../../assets/hncc-logo.png';
// this is the logo for the current theme
import Logo from '../../assets/christmas_theme/christmas-theme-logo.png';
import Logo from '../../assets/hncc-logo.png';
import Button from '../button/Button';
import Sidebar from './Sidebar';

Expand Down Expand Up @@ -43,8 +41,8 @@ function Navbar() {
}

if (prevScroll < currentScrollPos) {
navList.classList.add('fade-up');
title.classList.add('fade-up');
// navList.classList.add('fade-up');
// title.classList.add('fade-up');
navbar.style.borderBottom = '1px solid rgba(255, 255, 255, 0.2)';
} else {
navList.classList.remove('fade-up');
Expand Down Expand Up @@ -77,6 +75,9 @@ function Navbar() {
<Link href="/teams">
<a className={styles.navLink}>TEAM</a>
</Link>
<Link href="/alumni">
<a className={styles.navLink}>ALUMNI</a>
</Link>
<Link href="/events">
<a className={styles.navLink}>EVENTS</a>
</Link>
Expand Down
3 changes: 1 addition & 2 deletions components/navbar/Navbar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
@apply sm:px-6;
@apply xs:px-3;
background-color: rgba(24, 30, 35, 0.45);
/* background-color: transparent; */
backdrop-filter: blur(8px);
}

Expand All @@ -28,7 +27,7 @@
width: fit-content;
}
.navbarList > .navLink:hover {
@apply text-golden font-medium;
@apply text-blue font-medium;
}

.humburgerMenu {
Expand Down
5 changes: 5 additions & 0 deletions components/navbar/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ function Sidebar({ isMounted, unmount }) {
Team
</a>
</Link>
<Link href="/alumni">
<a className={styles.navLink} onClick={unmount}>
Alumni
</a>
</Link>
<Link href="/contact">
<a className={styles.navLink} onClick={unmount}>
Contact Us
Expand Down
5 changes: 1 addition & 4 deletions components/socialsbar/SocialsBar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@
}
.socialsBarIcons:hover {
@apply text-blue-light;
fill: rgb(255, 237, 121) !important;

/* background: radial-gradient(circle, #ffed79 1.18%, #ffa776 98.69%);
overflow: hidden; */
fill: rgb(56, 200, 236) !important;
}
3 changes: 2 additions & 1 deletion components/teams/TeamCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Style from './Team.module.css';

const ICON_SIZE = 28;

function TeamCard({ name, title, socials, imageSrc, lazyImageSrc }) {
function TeamCard({ name, title, company, socials, imageSrc, lazyImageSrc }) {
return (
<div className={Style.card}>
<div className="z-10 w-full text-center h-2/3 mb-18 mt-4 overflow-hidden rounded-lg">
Expand All @@ -23,6 +23,7 @@ function TeamCard({ name, title, socials, imageSrc, lazyImageSrc }) {
<div className="z-10 text-center my-5">
<h3 className="text-xl">{name}</h3>
<h4>{title}</h4>
<h2>{company}</h2>
</div>
<div className={Style.socials}>
{socials.gb || socials.email || socials.linkedin ? (
Expand Down
13 changes: 0 additions & 13 deletions components/video/Video.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@
@apply relative;
height: 90vh;
@apply sm:h-auto;
background: url(../../assets/christmas_theme/background3.png);
background-size: cover;
}

.GRADIENT {
background-image: linear-gradient(
to bottom,
rgba(255, 255, 255, 0),
rgba(255, 255, 255, 1) 90%
);
}

.designVideoContainer {
Expand Down Expand Up @@ -66,9 +56,6 @@
@apply my-8 mx-4 text-7xl z-30 font-extrabold relative;
@apply md:text-5xl;
@apply sm:my-4;
background: linear-gradient(90.28deg, #ffed79 1.18%, #ffa776 98.69%);
-webkit-background-clip: text;
color: transparent;
}

.content > h1::before,
Expand Down
Loading