fix merge (Clara Zhang pull request) (#99)

This PR is from Clara Zhang
uclaacm · Jan 28, 2025 · 2c50c9a · 2c50c9a
1 parent d85d476
commit 2c50c9a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -1 +1,3 @@
-.env
+.env
+website/package-lock.json
+website/package.json
diff --git 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
@@ -76,3 +76,7 @@
 .fade-exit-active {
   transition: opacity 500ms;
 }
+
+.gray {
+  background-color: gray;
+}