From 91754df31dd750234270c1b055644b8559272c4a Mon Sep 17 00:00:00 2001 From: Rahul Khanna Date: Tue, 28 Jan 2025 11:54:04 -0800 Subject: [PATCH] fix merge here2 --- .gitignore | 5 ++++- website/.gitignore | 4 +++- website/src/caseStudies/FacialRecognition.js | 2 +- .../src/components/posts/Facebook/conclusion/conclusion.css | 4 ++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2cc4432..224c5dd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,10 @@ website/build .env.development.local .env.test.local .env.production.local - +package.json +package-lock.json +website/package-lock.json +website/package.json npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/website/.gitignore b/website/.gitignore index 2eea525..a5c2ff0 100644 --- a/website/.gitignore +++ b/website/.gitignore @@ -1 +1,3 @@ -.env \ No newline at end of file +.env +website/package-lock.json +website/package.json \ No newline at end of file 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; +}