Fix merge conflict

HackRU · Aug 30, 2023 · 9ad8256 · 9ad8256
2 parents 2c23a42 + 76938ae
commit 9ad8256
Show file tree

Hide file tree

Showing 59 changed files with 631 additions and 17,701 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
         "bootstrap": "^4.1.3",
         "chart.js": "^2.9.4",
         "font-awesome": "^4.7.0",
+        "gsap": "^2.1.3",
         "material-ui-chip-input": "^1.1.0",
         "parallax-js": "^3.1.0",
         "qrcode.react": "^0.9.3",

diff --git a/public/index-s23.css b/public/index-s23.css
@@ -6,7 +6,7 @@
     --primary-color: #FFF5e8; /* Logo, link colors, text */
     --primary-color-alt: #4fab5f;  /* Form body bg, form headers text */
     --secondary-color: #000000; /* Barely used accent color...combine this and primary-color-alt...? */
-    --secondary-color-alt:#1f6aa0; /* Background color */
+    --secondary-color-alt: #8db67e; /* Background color */
     --accent-color:  #4bbede; /* Logout, Live button color */
     /* split card colors */
     --splitCard-color:#000000;