From 536c63110f9202d2b93585a777fa5f0cefdffd09 Mon Sep 17 00:00:00 2001 From: Rahul Khanna Date: Tue, 28 Jan 2025 11:38:35 -0800 Subject: [PATCH] fix merge here --- website/src/caseStudies/FacialRecognition.js | 2 +- .../src/components/posts/Facebook/conclusion/conclusion.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/website/src/caseStudies/FacialRecognition.js b/website/src/caseStudies/FacialRecognition.js index 615f1c5..889e520 100644 --- a/website/src/caseStudies/FacialRecognition.js +++ b/website/src/caseStudies/FacialRecognition.js @@ -25,7 +25,7 @@ const FacialRecognitionInfo = [ post: { profilePic: teachLogo, profilePicName: "Profile Picture - TeachLA Logo", - header: "Case Study #3: Facial Recognition", + header: "Case Study #3: Face Recognition", subheader: "Stay Tuned For More!", bodyText: [ { diff --git a/website/src/components/posts/Facebook/conclusion/conclusion.css b/website/src/components/posts/Facebook/conclusion/conclusion.css index 089a349..294579d 100644 --- a/website/src/components/posts/Facebook/conclusion/conclusion.css +++ b/website/src/components/posts/Facebook/conclusion/conclusion.css @@ -76,3 +76,7 @@ .fade-exit-active { transition: opacity 500ms; } + +.gray { + background-color: gray; +}