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
1 change: 1 addition & 0 deletions public/_redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
Binary file added src/assets/images/about-photo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/components/app/navigation-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const NAV_LINKS: NavEntry[] = [
{ href: "/events", label: "Events" },
{ href: "/sigs", label: "SIGs" },
{ href: "/projects", label: "Projects" },
{ href: "/resources", label: "Resources" },
];

const NAV_LINK_CLASSES =
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ function AccordionContent({
return (
<AccordionPrimitive.Panel
data-slot="accordion-content"
className="overflow-hidden text-sm data-open:animate-accordion-down data-closed:animate-accordion-up"
className="overflow-hidden text-sm"
{...props}
>
<div
className={cn(
"h-(--accordion-panel-height) pt-0 pb-4 data-ending-style:h-0 data-starting-style:h-0 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
"pt-0 pb-4 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
className
)}
>
Expand Down
14 changes: 14 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
--brand-text-hero: #ebf2f1;
--brand-navbar: #00e1bf;
--brand-footer: rgba(0, 225, 191, 0.85);

/* Per-SIG accent colors. Funneled into `--sig-color` on each SIG section. */
--sig-swe: #3da9fc;
--sig-ai: #00c9a7;
--sig-cyber: #ff6b6b;
--sig-data: #f7b731;
--sig-graph: #a55eea;
--sig-arch: #fc5c7d;
}
/*
---break---
Expand Down Expand Up @@ -137,6 +145,12 @@
--color-brand-text-hero: var(--brand-text-hero);
--color-brand-navbar: var(--brand-navbar);
--color-brand-footer: var(--brand-footer);
--color-sig-swe: var(--sig-swe);
--color-sig-ai: var(--sig-ai);
--color-sig-cyber: var(--sig-cyber);
--color-sig-data: var(--sig-data);
--color-sig-graph: var(--sig-graph);
--color-sig-arch: var(--sig-arch);
--radius-sm: calc(var(--radius) - 4px);
--radius-md: calc(var(--radius) - 2px);
--radius-lg: var(--radius);
Expand Down
42 changes: 39 additions & 3 deletions src/routeTree.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,20 @@
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

import { Route as rootRouteImport } from './routes/__root'
import { Route as SigsRouteImport } from './routes/sigs'
import { Route as AboutRouteImport } from './routes/about'
import { Route as IndexRouteImport } from './routes/index'

const SigsRoute = SigsRouteImport.update({
id: '/sigs',
path: '/sigs',
getParentRoute: () => rootRouteImport,
} as any)
const AboutRoute = AboutRouteImport.update({
id: '/about',
path: '/about',
getParentRoute: () => rootRouteImport,
} as any)
const IndexRoute = IndexRouteImport.update({
id: '/',
path: '/',
Expand All @@ -19,28 +31,50 @@ const IndexRoute = IndexRouteImport.update({

export interface FileRoutesByFullPath {
'/': typeof IndexRoute
'/about': typeof AboutRoute
'/sigs': typeof SigsRoute
}
export interface FileRoutesByTo {
'/': typeof IndexRoute
'/about': typeof AboutRoute
'/sigs': typeof SigsRoute
}
export interface FileRoutesById {
__root__: typeof rootRouteImport
'/': typeof IndexRoute
'/about': typeof AboutRoute
'/sigs': typeof SigsRoute
}
export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
fullPaths: '/'
fullPaths: '/' | '/about' | '/sigs'
fileRoutesByTo: FileRoutesByTo
to: '/'
id: '__root__' | '/'
to: '/' | '/about' | '/sigs'
id: '__root__' | '/' | '/about' | '/sigs'
fileRoutesById: FileRoutesById
}
export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
AboutRoute: typeof AboutRoute
SigsRoute: typeof SigsRoute
}

declare module '@tanstack/react-router' {
interface FileRoutesByPath {
'/sigs': {
id: '/sigs'
path: '/sigs'
fullPath: '/sigs'
preLoaderRoute: typeof SigsRouteImport
parentRoute: typeof rootRouteImport
}
'/about': {
id: '/about'
path: '/about'
fullPath: '/about'
preLoaderRoute: typeof AboutRouteImport
parentRoute: typeof rootRouteImport
}
'/': {
id: '/'
path: '/'
Expand All @@ -53,6 +87,8 @@ declare module '@tanstack/react-router' {

const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
AboutRoute: AboutRoute,
SigsRoute: SigsRoute,
}
export const routeTree = rootRouteImport
._addFileChildren(rootRouteChildren)
Expand Down
Loading