diff --git a/public/fonts/Iosevka-Curly-Bold-Extended.woff2 b/public/fonts/Iosevka-Curly-Bold-Extended.woff2 new file mode 100644 index 0000000..55e8cf3 Binary files /dev/null and b/public/fonts/Iosevka-Curly-Bold-Extended.woff2 differ diff --git a/public/fonts/Iosevka-Curly-Medium.woff2 b/public/fonts/Iosevka-Curly-Medium.woff2 new file mode 100644 index 0000000..c259d67 Binary files /dev/null and b/public/fonts/Iosevka-Curly-Medium.woff2 differ diff --git a/public/fonts/Iosevka-Curly-Regular.woff2 b/public/fonts/Iosevka-Curly-Regular.woff2 new file mode 100644 index 0000000..e3511d7 Binary files /dev/null and b/public/fonts/Iosevka-Curly-Regular.woff2 differ diff --git a/public/fonts/Iosevka-Curly-SemiBoldItalic.woff2 b/public/fonts/Iosevka-Curly-SemiBoldItalic.woff2 new file mode 100644 index 0000000..8cb0331 Binary files /dev/null and b/public/fonts/Iosevka-Curly-SemiBoldItalic.woff2 differ diff --git a/public/fonts/Iosevka-Curly-Semibold.woff2 b/public/fonts/Iosevka-Curly-Semibold.woff2 new file mode 100644 index 0000000..e31486f Binary files /dev/null and b/public/fonts/Iosevka-Curly-Semibold.woff2 differ diff --git a/public/fonts/NB-International-Mono.ttf b/public/fonts/NB-International-Mono.ttf deleted file mode 100644 index dfa8346..0000000 Binary files a/public/fonts/NB-International-Mono.ttf and /dev/null differ diff --git a/public/fonts/NB-International-Pro-Light.otf b/public/fonts/NB-International-Pro-Light.otf deleted file mode 100644 index aea72b8..0000000 Binary files a/public/fonts/NB-International-Pro-Light.otf and /dev/null differ diff --git a/public/fonts/NB-International-Regular.ttf b/public/fonts/NB-International-Regular.ttf deleted file mode 100644 index b9bc396..0000000 Binary files a/public/fonts/NB-International-Regular.ttf and /dev/null differ diff --git a/public/fonts/Neue-Plak-Extended-Bold.ttf b/public/fonts/Neue-Plak-Extended-Bold.ttf deleted file mode 100644 index 5bd0b46..0000000 Binary files a/public/fonts/Neue-Plak-Extended-Bold.ttf and /dev/null differ diff --git a/public/fonts/NeuePlak-ExtendedBold.woff2 b/public/fonts/NeuePlak-ExtendedBold.woff2 deleted file mode 100644 index bb61fab..0000000 Binary files a/public/fonts/NeuePlak-ExtendedBold.woff2 and /dev/null differ diff --git a/public/images/icons/info-icon.svg b/public/images/icons/info-icon.svg new file mode 100644 index 0000000..87b0ba5 --- /dev/null +++ b/public/images/icons/info-icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/images/logos/dco-logo.svg b/public/images/logos/dco-logo.svg new file mode 100644 index 0000000..7042dba --- /dev/null +++ b/public/images/logos/dco-logo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/images/logos/stride-logo.svg b/public/images/logos/stride-logo.svg new file mode 100644 index 0000000..62f92c4 --- /dev/null +++ b/public/images/logos/stride-logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 84a83f0..0888314 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,6 +2,7 @@ import type { Metadata } from 'next'; import localFont from 'next/font/local'; import '@/app/styles/global.scss'; import { ReactNode } from 'react'; +import Navbar from '@/components/Navbar/Navbar'; export const metadata: Metadata = { title: 'Stride 2024', @@ -9,22 +10,30 @@ export const metadata: Metadata = { 'Stride is a uniquely design-forward career fair aiming to connect aspiring designers with company representatives.' }; -const NeuePlak = localFont({ - src: '../../public/fonts/Neue-Plak-Extended-Bold.ttf', - variable: '--font-neueplak', - display: 'swap' -}); - -const NBInternational = localFont({ - src: '../../public/fonts/NB-International-Pro-Light.otf', - variable: '--font-nbinternational', - display: 'swap' -}); - -const NBInternationalMono = localFont({ - src: '../../public/fonts/NB-International-Mono.ttf', - variable: '--font-nbinternational-mono', - display: 'swap' +const IosevkaCurly = localFont({ + src: [ + { + path: '../../public/fonts/Iosevka-Curly-Regular.woff2', + weight: '400', + style: 'normal' + }, + { + path: '../../public/fonts/Iosevka-Curly-Medium.woff2', + weight: '500', + style: 'normal' + }, + { + path: '../../public/fonts/Iosevka-Curly-SemiBold.woff2', + weight: '600', + style: 'normal' + }, + { + path: '../../public/fonts/Iosevka-Curly-SemiBoldItalic.woff2', + weight: '600', + style: 'italic' + } + ], + variable: '--font-iosevka' }); export default function RootLayout({ @@ -33,11 +42,11 @@ export default function RootLayout({ children: ReactNode; }>) { return ( - - {children} + + + + {children} + ); } diff --git a/src/app/styles/_var.scss b/src/app/styles/_var.scss index 2bd36f2..b1a2162 100644 --- a/src/app/styles/_var.scss +++ b/src/app/styles/_var.scss @@ -1,8 +1,9 @@ -$p-font: var(--font-nbinternational); -$heading-font: var(--font-neueplak); -$mono-font: var(--font-nbinternational-mono); +$p-font: var(--font-iosevka); +$heading-font: var(--font-iosevka); +$mono-font: var(--font-iosevka); $light-green: #68dea3; +$white: #fbfefc; $mobile-breakpoint: 768px; $tablet-breakpoint: 1366px; diff --git a/src/app/styles/global.scss b/src/app/styles/global.scss index a020e74..94f8138 100644 --- a/src/app/styles/global.scss +++ b/src/app/styles/global.scss @@ -34,7 +34,7 @@ h4, button, input, label { - line-height: 1.1; + line-height: 100%; } h1, @@ -42,13 +42,13 @@ h2, h3, h4 { font-family: $heading-font, Arial, sans-serif; - font-weight: 500; - line-height: 1.2; + line-height: 100%; margin: 0; } h1 { font-size: $h1-size; + font-style: italic; } h2 { diff --git a/src/components/Navbar/Navbar.scss b/src/components/Navbar/Navbar.scss new file mode 100644 index 0000000..73aa0fd --- /dev/null +++ b/src/components/Navbar/Navbar.scss @@ -0,0 +1,46 @@ +#navbar { + position: absolute; + z-index: 1; + padding: 3.5rem 3.75rem; + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + + #nav-logo-container { + display: grid; + gap: 10px; + } + + #nav-button-container { + display: flex; + align-items: center; + gap: 1.5rem; + font-family: $p-font; + font-weight: 500; + font-size: 1.25rem; + line-height: 100%; + + #about-button { + border-radius: 20px; + border: 2px solid $white; + background: black; + padding: 0.5rem 0.75rem; + display: flex; + align-items: center; + gap: 0.5rem; + } + + #register-button { + border-radius: 30px; + background: $white; + color: black; + padding: 1.125rem 2rem; + text-transform: uppercase; + } + + a { + text-decoration: none; + } + } +} diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx new file mode 100644 index 0000000..7968775 --- /dev/null +++ b/src/components/Navbar/Navbar.tsx @@ -0,0 +1,41 @@ +import Image from 'next/image'; +import './Navbar.scss'; +import Link from 'next/link'; + +export default function Navbar() { + return ( + + ); +}