-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a massive overhaul! Firstly, we are switching to tailwind. Bootstrap sucks and was a poor decision originally. Tailwind makes developement easier with better helper classes and better deduplication, especially when combined with postcss etc.. Secondly, we are introducing dark mode. Tailwind has great dark mode support. Right now it is browser-based, but we may swap to a selector at some point depending on feedback. Thirdly, we are now using next/font, which is vastly superior to importing fonts manually. It seems to be working as expected. No more pop-in! Finally, there was some assorted cleanup done and a couple bugfixes added. These probably shouldn't be in this commit but such is life.
- Loading branch information
1 parent
f6cfc73
commit 6faf803
Showing
20 changed files
with
971 additions
and
294 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { Montserrat, Play } from 'next/font/google' | ||
|
||
export const mont = Montserrat({ | ||
subsets: ['latin', 'latin-ext'], | ||
display: 'swap', | ||
weight: ['300', '400', '500', '700'], | ||
variable: '--font-mont', | ||
}); | ||
|
||
export const play = Play({ | ||
subsets: ['latin', 'latin-ext'], | ||
display: 'swap', | ||
style: 'normal', | ||
weight: ['400', '700'], | ||
variable: '--font-play', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ import './globals.css' | |
import Script from 'next/script' | ||
import { NextAuthProvider } from './NextAuthProvider'; | ||
import Footer from '@/components/footer'; | ||
import { mont } from './fonts'; | ||
|
||
export const metadata = { | ||
title: 'Cygnet', | ||
|
@@ -16,8 +17,8 @@ export default function RootLayout({ | |
}) { | ||
return ( | ||
<NextAuthProvider> | ||
<html lang="en"> | ||
<body className="bg"> | ||
<html lang="en" className={`${mont.className} font-medium`}> | ||
<body className="bg-page-bg-light dark:bg-page-bg-dark"> | ||
<div className="most-height"> | ||
<Nav /> | ||
<div className=""> | ||
|
@@ -26,8 +27,6 @@ export default function RootLayout({ | |
</div> | ||
<Footer/> | ||
</body> | ||
{/*@ts-ignore*/} | ||
<Script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossOrigin="anonymous" /> | ||
<Script src="https://kit.fontawesome.com/3d9fad96a7.js" crossOrigin="anonymous" /> | ||
</html> | ||
</NextAuthProvider> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
export default function Footer() { | ||
return ( | ||
<footer className="py-2 bg-white footer-height shadow-sm"> | ||
<div className="container h-100 d-flex justify-content-center align-items-center"> | ||
<footer className="py-2 bg-white dark:bg-dark-blue footer-height flex justify-center items-center shadow"> | ||
<div className="max-w-screen-lg h-full content-center px-2"> | ||
<p | ||
className="mont text-black mb-0 tiny-font" | ||
className="text-black dark:text-white text-center mb-0 text-sm" | ||
> | ||
© 2024 Swarthmore College Computer Society | | ||
<a className="grad" href="https://www.sccs.swarthmore.edu/docs/policy">Usage & Data Policy</a> | ||
<a className="grad hover:brightness-150 dark:brightness-150 dark:hover:brightness-100" href="https://www.sccs.swarthmore.edu/docs/policy">Usage & Data Policy</a> | ||
| Problems with this website? Email | ||
<a className="grad" href="mailto:[email protected]">[email protected]</a>. | ||
<a className="grad hover:brightness-150 dark:brightness-150 dark:hover:brightness-100" href="mailto:[email protected]">[email protected]</a>. | ||
</p> | ||
</div> | ||
</footer> | ||
|
Oops, something went wrong.