Merge branch 'dev' into prod

Author: nrakhshan

client/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>F!rosh Week</title>
-    <link rel="icon" type="image/x-icon" href="/src/assets/logo/main-logo.png">
+    <link rel="icon" type="image/x-icon" href="/src/assets/logo/main-logo-2T5.png">
     <meta name="description" content="The University of Toronto's Engineering Student's Orientation Week Event">
     <meta name="keywords" content="F!rosh Week, UofT Engineering, Engineering Orientation, F!rosh Week UofT, Frosh Week, Frosh Week UofT, University of Toronto, University of Toronto Orientation">
     <meta name="author" content="Orientation Committee">

client/src/App.scss

@@ -24,6 +24,15 @@
 @font-face {
   font-family: 'Proxima Nova';
   src: url('../assets/fonts/proximanova_regular.ttf') format('opentype');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Proxima Nova';
+  src: url('../assets/fonts/proximanova_bold.ttf') format('opentype');
+  font-weight: 800;
+  font-style: normal;
 }
 
 @font-face {
@@ -66,7 +75,7 @@ h2,
 h3,
 h4,
 h5 {
-  font-family: 'LittleWitches', serif;
+  font-family: 'Proxima Nova', sans-serif;
   margin: 0px;
   padding: 0px;
 }

client/src/assets/logo/main-logo-2T5.png

@@ -213,7 +213,7 @@ const FAQPageHeader = ({
       return questions;
     }
     return questions.filter((question) => {
-      const questionName = question.question.toLowerCase();
+      const questionName = question.question.toLowerCase() + question.answer.toLowerCase();
       return questionName.includes(query.toLowerCase());
     });
   };