Merge branch 'master' into hc-review-tags

cornell-dti · Dec 3, 2023 · 775089c · 775089c
2 parents 09fe9d1 + 2427e0d
commit 775089c
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 68 deletions.
diff --git a/client/src/modules/Course/Components/ReviewCard.tsx b/client/src/modules/Course/Components/ReviewCard.tsx
@@ -4,6 +4,7 @@ import axios from 'axios'
 import ShowMoreText from 'react-show-more-text'
 
 import { Review as ReviewType } from 'common'
+
 import Tag from './Tag'
 import tag_names from '../../Globals/tag_names'
 import styles from '../Styles/Review.module.css'

diff --git a/client/src/modules/Course/Styles/Review.module.css b/client/src/modules/Course/Styles/Review.module.css
@@ -39,11 +39,6 @@
   line-height: 18px;
 }
 
-.tagContainer {
-  display: flex;
-  flex-wrap: wrap;
-}
-
 .ratingsContainerColor {
   background: #ffffff;
 }
@@ -52,11 +47,6 @@
   background-color: #f9f9f9;
 }
 
-.tagContainer {
-  display: flex;
-  flex-wrap: wrap;
-}
-
 @media screen and (max-width: 768px) {
   .ratingsContainerColor {
     background: #f4f9fe;

diff --git a/client/src/modules/Globals/Navbar.tsx b/client/src/modules/Globals/Navbar.tsx
@@ -68,12 +68,12 @@ export default function Navbar({ userInput }: NavbarProps) {
         <a className="" href="/">
           <img
             src="/logo.svg"
-            className="img-fluid scale-logo-navbar"
+            className="scale-logo-navbar"
             alt="CU Reviews Logo"
           />
         </a>
       </div>
-      <div className="col navbar-searchbar-container">
+      <div className={`col navbar-searchbar-container${isLoggedIn ? "-profile" : ""}`}>
         <SearchBar
           userInput={userInput}
           contrastingResultsBackground={true}

diff --git a/client/src/modules/Globals/Styles/NavBar.css b/client/src/modules/Globals/Styles/NavBar.css
@@ -10,7 +10,12 @@
 
   .navbar-searchbar-container {
     margin-left: 21px;
-    margin-right: 70px;
+    margin-right: 150px;
+  }
+
+  .navbar-searchbar-container-profile {
+    width: 100%;
+    margin-right: 12%;
   }
 }
 
@@ -22,6 +27,11 @@
   .navbar-searchbar-container {
     margin-right: 220px;
   }
+
+  .navbar-searchbar-container-profile {
+    width: 100%;
+    margin-right: 15%;
+  }
 }
 
 .custom-navbar {
@@ -63,6 +73,37 @@
   margin-top: 12px;
   text-align: right;
   padding-right: 30px;
+
+}
+
+@media (max-width: 480px) {
+  .custom-navbar {
+    width: 100%;
+    padding-top: 40px;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-bottom: 0px;
+    box-shadow: none;
+    z-index: 110;
+    top: 0px;
+    position: relative;
+    background: transparent;
+    border: 0;
+    margin: 0;
+    display: flex;
+  }
+
+  .logo-container {
+    width: 14vw;
+    padding-top: 1vw;
+    margin-right: 4vw;
+    margin-left: 5vw;
+  }
+
+  .navbar-searchbar-container {
+    margin-left: 0rem;
+    width: 100vw;
+  }
 }
 
 @media (max-width: 480px) {

diff --git a/client/src/modules/Profile/Styles/App.css b/client/src/modules/Profile/Styles/App.css
@@ -14,6 +14,28 @@
   .scale-logo-homepage {
     margin: 120px 0px 0px 120px;
   }
+
+  .sign-in-button {
+    position: absolute;
+    right: 30px;
+    top: 40px;
+
+    width: 10%;
+    height: 39px;
+
+    background: #ffffff;
+    border-radius: 10px;
+
+    font-family: Source Sans Pro;
+    font-style: normal;
+    font-weight: 600;
+    font-size: 18px;
+    line-height: 23px;
+    text-align: center;
+    letter-spacing: -0.22px;
+
+    color: #000000;
+  }
 }
 
 @media (max-width: 992px) {
@@ -29,6 +51,10 @@
   .scale-logo-homepage {
     margin: 120px 0px 0px 30px;
   }
+
+  .sign-in-button {
+    width: 100px;
+  }
 }
 
 .scale-logo-homepage {
@@ -53,21 +79,17 @@
 
 .background-gradient_afternoonsummer {
   background-image: url('/bg_afternoon_summer.svg'),
-    linear-gradient(
-      180deg,
+    linear-gradient(180deg,
       rgba(123, 179, 244, 0.7) 0%,
-      rgba(255, 255, 255, 0) 77.1%
-    );
+      rgba(255, 255, 255, 0) 77.1%);
 }
 
 .background-gradient_sunsetsummer {
   background-image: url('/bg_sunset_summer.svg'),
-    linear-gradient(
-      201.93deg,
+    linear-gradient(201.93deg,
       rgba(91, 154, 226, 0.7) 19.17%,
       rgba(255, 228, 196, 0.7) 57.66%,
-      rgba(253, 144, 65, 0.7) 84.88%
-    );
+      rgba(253, 144, 65, 0.7) 84.88%);
 }
 
 .background-gradient_nightsummer {
@@ -77,21 +99,17 @@
 
 .background-gradient_afternoonfall {
   background-image: url('/bg_afternoon_fall.svg'),
-    linear-gradient(
-      180deg,
+    linear-gradient(180deg,
       rgba(255, 255, 255, 0) 0%,
-      rgba(255, 218, 175, 0.42) 77.1%
-    );
+      rgba(255, 218, 175, 0.42) 77.1%);
 }
 
 .background-gradient_sunsetfall {
   background-image: url('/bg_sunset_fall.svg'),
-    linear-gradient(
-      201.93deg,
+    linear-gradient(201.93deg,
       rgba(0, 93, 189, 0.7) 19.17%,
       rgba(145, 125, 181, 0.7) 50.25%,
-      rgba(255, 164, 94, 0.7) 84.88%
-    );
+      rgba(255, 164, 94, 0.7) 84.88%);
 }
 
 .background-gradient_nightfall {
@@ -101,23 +119,19 @@
 
 .background-gradient_afternoonwinter {
   background-image: url('/bg_afternoon_winter.svg'),
-    linear-gradient(
-      180deg,
+    linear-gradient(180deg,
       rgba(138, 185, 239, 0.7) 12.85%,
-      rgba(185, 217, 255, 0) 77.1%
-    );
+      rgba(185, 217, 255, 0) 77.1%);
 }
 
 .background-gradient_sunsetwinter {
   background-image: url('/bg_sunset_winter.svg'),
-    linear-gradient(
-      201.93deg,
+    linear-gradient(201.93deg,
       rgba(2, 32, 66, 0.7) 14.7%,
       rgba(10, 68, 108, 0.7) 27.25%,
       rgba(144, 133, 147, 0.7) 55.16%,
       rgba(252, 137, 48, 0.7) 75.47%,
-      rgba(222, 89, 24, 0.7) 84.88%
-    );
+      rgba(222, 89, 24, 0.7) 84.88%);
 }
 
 .background-gradient_nightwinter {
@@ -127,22 +141,18 @@
 
 .background-gradient_afternoonspring {
   background-image: url('/bg_afternoon_spring.svg'),
-    linear-gradient(
-      180deg,
+    linear-gradient(180deg,
       rgba(51, 145, 254, 0.7) 7.5%,
-      rgba(255, 255, 255, 0.7) 79.5%
-    );
+      rgba(255, 255, 255, 0.7) 79.5%);
 }
 
 .background-gradient_sunsetspring {
   background-image: url('/bg_sunset_spring.svg'),
-    linear-gradient(
-      201.93deg,
+    linear-gradient(201.93deg,
       rgba(164, 193, 209, 0.7) 19.17%,
       rgba(246, 228, 218, 0.7) 50.25%,
       rgba(255, 182, 121, 0.7) 73.5%,
-      rgba(247, 124, 74, 0.7) 84.88%
-    );
+      rgba(247, 124, 74, 0.7) 84.88%);
 }
 
 .background-gradient_nightspring {
@@ -162,26 +172,4 @@
 .full-height {
   height: 100%;
   background-color: #f4f9fe;
-}
-
-.sign-in-button {
-  position: absolute;
-  right: 30px;
-  top: 40px;
-
-  width: 137px;
-  height: 39px;
-
-  background: #ffffff;
-  border-radius: 10px;
-
-  font-family: Source Sans Pro;
-  font-style: normal;
-  font-weight: 600;
-  font-size: 18px;
-  line-height: 23px;
-  text-align: center;
-  letter-spacing: -0.22px;
-
-  color: #000000;
-}
+}