diff --git a/src/assets/fonts/NB-International-Regular.ttf b/public/fonts/NB-International-Regular.ttf similarity index 100% rename from src/assets/fonts/NB-International-Regular.ttf rename to public/fonts/NB-International-Regular.ttf diff --git a/src/assets/fonts/NeuePlak-ExtendedBold.woff2 b/public/fonts/NeuePlak-ExtendedBold.woff2 similarity index 100% rename from src/assets/fonts/NeuePlak-ExtendedBold.woff2 rename to public/fonts/NeuePlak-ExtendedBold.woff2 diff --git a/src/assets/fonts/ridge-bold-oblique.otf b/public/fonts/ridge-bold-oblique.otf similarity index 100% rename from src/assets/fonts/ridge-bold-oblique.otf rename to public/fonts/ridge-bold-oblique.otf diff --git a/src/components/JudgeComponent/JudgeComponent.scss b/src/components/JudgeComponent/JudgeComponent.scss index e69de29..153f06a 100644 --- a/src/components/JudgeComponent/JudgeComponent.scss +++ b/src/components/JudgeComponent/JudgeComponent.scss @@ -0,0 +1,8 @@ +.judge-image { + mask: url(#trapezoidMask); + -webkit-mask: url(#trapezoidMask); +} + +.judge-card { + display: flex; +} diff --git a/src/components/JudgeComponent/JudgeComponent.tsx b/src/components/JudgeComponent/JudgeComponent.tsx index e69de29..1165858 100644 --- a/src/components/JudgeComponent/JudgeComponent.tsx +++ b/src/components/JudgeComponent/JudgeComponent.tsx @@ -0,0 +1,60 @@ +import "./JudgeComponent.scss"; + +interface JudgeProps { + name: string; + pronouns: string; + position: string; + funFact: string; +} + +const JudgeComponent = (props: JudgeProps) => { + return ( +
+ + + + + + + + + + + + +
+

Name: {props.name}

+

Pronouns: {props.pronouns}

+

Position: {props.position}

+

Fun Fact: {props.funFact}

+
+
+ ); +}; + +export default JudgeComponent; diff --git a/src/pages/FAQ/FAQ.scss b/src/pages/FAQ/FAQ.scss index 0d479c5..8792ba3 100644 --- a/src/pages/FAQ/FAQ.scss +++ b/src/pages/FAQ/FAQ.scss @@ -1,32 +1,9 @@ -$desktop-padding: 8vw; -$heading-font: "Ridge Bold", sans-serif; -$text-font: "NB International", sans-serif; - -@font-face { - font-family: "Ridge Bold"; - src: url("../../assets/fonts/ridge-bold-oblique.otf") format("opentype"); -} - -@font-face { - font-family: "NB International"; - src: url("../../assets/fonts/NB-International-Regular.ttf") format("truetype"); -} - -h2 { - font-family: "Ridge Bold"; - font-size: 1.5rem; - margin: 0; -} - .faq { height: 100%; overflow: hidden; display: flex; align-items: center; - > .faq-container { - p { - font-family: $text-font; - } + .faq-container { } } diff --git a/src/pages/FAQ/FAQ.tsx b/src/pages/FAQ/FAQ.tsx index ca134c4..2da1e4e 100644 --- a/src/pages/FAQ/FAQ.tsx +++ b/src/pages/FAQ/FAQ.tsx @@ -1,4 +1,3 @@ -/* eslint-disable react/jsx-key */ import "./FAQ.scss"; import { useRef } from "react"; @@ -55,9 +54,9 @@ export default function FAQ() {

FAQ

{FaqList1.map((item) => ( -
+

{item.question}

-

+

{item.answer}

))}
@@ -66,9 +65,9 @@ export default function FAQ() {

FAQ

{FaqList2.map((item) => ( -
+

{item.question}

-

+

{item.answer}

))}
diff --git a/src/pages/Judges/Judges.scss b/src/pages/Judges/Judges.scss index f5cf1a5..2d1e325 100644 --- a/src/pages/Judges/Judges.scss +++ b/src/pages/Judges/Judges.scss @@ -1,2 +1,6 @@ .judges { + height: 100%; + overflow: hidden; + display: flex; + flex-direction: column; } diff --git a/src/pages/Judges/Judges.tsx b/src/pages/Judges/Judges.tsx index 650e489..026304b 100644 --- a/src/pages/Judges/Judges.tsx +++ b/src/pages/Judges/Judges.tsx @@ -1,9 +1,28 @@ import "./Judges.scss"; +import JudgeComponent from "../../components/JudgeComponent/JudgeComponent"; export default function Judges() { return (

Judges

+ + +
); } diff --git a/src/styles/App.scss b/src/styles/App.scss index eda227a..ac31fea 100644 --- a/src/styles/App.scss +++ b/src/styles/App.scss @@ -18,5 +18,11 @@ @media (max-width: $mobile-breakpoint) { padding: 0; } + + h2 { + font-family: $header-font; + font-size: 1.5rem; + margin: 0; + } } }