Merge pull request #17 from WEHack-UTD2-0/kelly

Logo change, minor color changes, hamburger menu changes

Author: KellyTranT

components/AppHeader.tsx

@@ -8,7 +8,7 @@ import { useAuthContext } from '../lib/user/AuthContext';
 import { navItems } from '../lib/data';
 import firebase from 'firebase/app';
 import Image from 'next/image';
-import wehacklogo from '../public/logoTransparent.png';
+import wehacklogo from '../public/LogoSparkle.png';
 
 /**
  * A global site header throughout the entire app.
@@ -78,16 +78,17 @@ export default function AppHeader() {
         <div className="flex w-6/12 max-w-[156px] justify-between items-center md:max-w-full md:justify-start md:w-9/12">
           <Link href="/">
             <a className="flex order-2 relative ml-[-6px] font-display self-center items-center w-[120px] md:order-1 md:ml-0 md:w-[120px]">
-              <Image src={wehacklogo} alt="Logo" width={500} height={380} objectFit="contain" />
+              <Image src={wehacklogo} alt="Logo" width={500} height={240} objectFit="contain" />
             </a>
           </Link>
+
           {/* Smartphone nav */}
           <div onClick={toggleMenu} className={'relative md:hidden'}>
             {mobileIcon ? <MenuIcon /> : <CloseIcon />}
             <ul
               className={`${
                 showMenu ? 'translate-x-0' : '-translate-x-full'
-              } transform transition-all ease-out duration-300 flex w-6/12 h-screen border-2 border-black flex-col bg-blue-450 fixed top-0 left-0 z-[-1] pt-20`}
+              } transform transition-all ease-out duration-300 flex w-6/12 h-screen border-2 border-black flex-col bg-green-300 fixed top-0 left-0 z-[-1] pt-20`}
             >
               {dynamicNavItems.map((item) => (
                 <Link key={item.text} href={item.path}>

components/faq.tsx

@@ -57,10 +57,11 @@ export default function FaqPage({ fetchedFaqs }: { fetchedFaqs: AnsweredQuestion
                 expandAll();
               }}
               className="font-bold"
+              style={{ color: '#FFE9D7' }}
             >
               Expand All
             </button>
-            <ChevronUpIcon className="w-5 h-5" />
+            <ChevronUpIcon className="w-5 h-5" style={{ color: '#FFE9D7' }} />
           </div>
         </div>
         {/* FAQ for lg-md */}

pages/admin/scan/index.tsx

@@ -345,7 +345,7 @@ export default function Admin() {
             {currentScan && (
               <div className="my-6">
                 <div className="flex flex-col gap-y-4">
-                  <div className="text-center text-xl font-black">
+                  <div className="text-center text-xl font-black" style={{ color: '#FFE9D7' }}>
                     {currentScan ? currentScan.name : ''}
                   </div>
                   {startScan ? (

pages/auth/index.tsx

@@ -140,7 +140,6 @@ export default function AuthPage() {
                     <div style={{ color: '#FFE9D7' }}>
                       <input
                         className="mx-1 text-yellow-250"
-                        style={{ color: '#FFE9D7' }}
                         type="checkbox"
                         onClick={() => showPassword('passwordInputLg')}
                       />
@@ -174,6 +173,7 @@ export default function AuthPage() {
             <div>
               <div className="w-[24rem] text-left">
                 <ArrowBackIcon
+                  style={{ color: '#FFE9D7' }}
                   className="cursor-pointer"
                   onClick={() => {
                     setPasswordResetDialog(false);
@@ -194,7 +194,7 @@ export default function AuthPage() {
                 ></input>
                 <button
                   style={{ color: '#FFE9D7' }}
-                  className="w-[24rem] px-4 py-2 rounded-md shadow-md bg-green-300 hover:shadow-lg hover:bg-green-100"
+                  className="w-[24rem] px-4 py-2 rounded-md shadow-md bg-green-100 hover:shadow-lg hover:bg-green-200"
                   onClick={() => {
                     sendResetEmail();
                     setErrorMsg('');
@@ -317,6 +317,7 @@ export default function AuthPage() {
               <div className="w-full text-left my-4">
                 <ArrowBackIcon
                   className="cursor-pointer"
+                  style={{ color: '#FFE9D7' }}
                   onClick={() => {
                     setPasswordResetDialog(false);
                     setErrorMsg('');
@@ -335,7 +336,7 @@ export default function AuthPage() {
                   placeholder="Email"
                 ></input>
                 <button
-                  className="px-4 py-2 rounded-md shadow-md bg-orange-550 hover:shadow-lg hover:bg-blue-450"
+                  className="px-4 py-2 rounded-md shadow-md bg-green-100 hover:shadow-lg hover:bg-green-200"
                   onClick={() => {
                     sendResetEmail();
                     setErrorMsg('');

tailwind.config.js

@@ -83,6 +83,7 @@ module.exports = {
         green: {
           100: '#909634',
           200: '#556B2F',
+          300: '#909634',
         },
         white: {
           100: '#FFE9D7',