Squashed commit of the following:

commit b76d0ca Author: Aaron Chan <[email protected]> Date: Mon Nov 11 15:28:06 2024 -0800 fix: add position fixed for mobile navbar commit 81c9a68 Author: Aaron Chan <[email protected]> Date: Mon Nov 11 15:06:14 2024 -0800 fix: fix typo for agenda times and remove conote & deloitte commit 1e3d51a Author: Aaron Chan <[email protected]> Date: Mon Nov 11 03:17:43 2024 -0800 fix: fix downloading badge and adjust styles commit 3ed2ce2 Author: Aaron Chan <[email protected]> Date: Sat Nov 9 20:42:04 2024 -0800 fix: update nerve asset and remove grad year 2029 commit e576cc8 Author: Aaron Chan <[email protected]> Date: Sat Nov 9 20:25:28 2024 -0800 feat: add support for viewing badges commit a1f5d4e Author: Aaron Chan <[email protected]> Date: Fri Nov 8 15:48:02 2024 -0800 Squashed commit of the following: commit 99da140 Author: Aaron Chan <[email protected]> Date: Fri Nov 8 01:09:27 2024 -0800 Squashed commit of the following: commit 787081b Author: Aaron Chan <[email protected]> Date: Fri Nov 8 01:05:04 2024 -0800 fix: use custom hover cursor everywhere and attempt to fix about images commit 8546381 Author: Aaron Chan <[email protected]> Date: Fri Nov 8 00:32:03 2024 -0800 fix: fix badge accessory bug and update form select styling commit f0382a2 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:45:31 2024 -0800 Squashed commit of the following: commit e979878 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:43:00 2024 -0800 fix: shorten copy for ucsd library companies section commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling commit 1fcf76a Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:06:29 2024 -0800 Squashed commit of the following: commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling commit b604bbb Merge: 8698310 7d23612 Author: Aaron Chan <[email protected]> Date: Fri Nov 8 00:36:08 2024 -0800 Merge branch 'main' of https://github.com/ucsddesignco/stride2024 commit 8698310 Author: Aaron Chan <[email protected]> Date: Fri Nov 8 00:35:45 2024 -0800 Squashed commit of the following: commit 8546381 Author: Aaron Chan <[email protected]> Date: Fri Nov 8 00:32:03 2024 -0800 fix: fix badge accessory bug and update form select styling commit f0382a2 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:45:31 2024 -0800 Squashed commit of the following: commit e979878 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:43:00 2024 -0800 fix: shorten copy for ucsd library companies section commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling commit 1fcf76a Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:06:29 2024 -0800 Squashed commit of the following: commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling commit 7d23612 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 16:10:19 2024 -0800 Update README.md commit e979878 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:43:00 2024 -0800 fix: shorten copy for ucsd library companies section commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling commit 787081b Author: Aaron Chan <[email protected]> Date: Fri Nov 8 01:05:04 2024 -0800 fix: use custom hover cursor everywhere and attempt to fix about images commit 8546381 Author: Aaron Chan <[email protected]> Date: Fri Nov 8 00:32:03 2024 -0800 fix: fix badge accessory bug and update form select styling commit f0382a2 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:45:31 2024 -0800 Squashed commit of the following: commit e979878 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:43:00 2024 -0800 fix: shorten copy for ucsd library companies section commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling commit 1fcf76a Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:06:29 2024 -0800 Squashed commit of the following: commit c52b4d6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 14:04:13 2024 -0800 fix: fix mobile agenda card commit f759e35 Merge: 26577a1 524c9b6 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 13:39:43 2024 -0800 Merge branch 'develop' commit 26577a1 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:11:30 2024 -0800 Squashed commit of the following: commit 1489486 Author: Aaron Chan <[email protected]> Date: Thu Nov 7 00:08:01 2024 -0800 fix: adjust registration styling and add register button duck commit 41b2778 Author: Aaron Chan <[email protected]> Date: Wed Nov 6 23:20:08 2024 -0800 fix: adjust registration styling
ucsddesignco · Nov 11, 2024 · 1665bc3 · 1665bc3
1 parent 206bc12
commit 1665bc3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/src/components/About/Agenda/Agenda.tsx b/src/components/About/Agenda/Agenda.tsx
@@ -149,7 +149,7 @@ export default function Agenda() {
         </g>
         <foreignObject x="15" y="100" width="330" height="413">
           <div id="mobile-agenda-content">
-            <h3>Wednesday, Nov. 13th 12-5pm PST</h3>
+            <h3>Wednesday, Nov. 13th 10am-2pm PST</h3>
             <table>
               <thead />
               <tbody>
@@ -243,7 +243,7 @@ export default function Agenda() {
         </g>
         <foreignObject x="200" y="48" width="1050" height="700">
           <div id="desktop-agenda-content">
-            <h3>Wednesday, Nov. 13th 12-5pm PST</h3>
+            <h3>Wednesday, Nov. 13th 10am-2pm PST</h3>
             <table>
               <thead />
               <tbody>

diff --git a/src/components/About/Companies/constants.ts b/src/components/About/Companies/constants.ts
@@ -17,13 +17,13 @@ export const companies: CompaniesMap = {
     description:
       'Art of Problem Solving is an education technology company inspiring and training the next generation of great problem solvers. They help students develop problem-solving skills by offering resources in a variety of different formats, building a community where students can connect and collaborate with their peers.'
   },
-  CoNote: {
-    name: 'CoNote',
-    org_type: 'Recruiting',
-    companyImage: 'images/company-images/conote.svg',
-    description:
-      'CoNote.ai is a start-up technology that helps researchers transcribe, analyze, and organize their data while collaborating with their team.'
-  },
+  // CoNote: {
+  //   name: 'CoNote',
+  //   org_type: 'Recruiting',
+  //   companyImage: 'images/company-images/conote.svg',
+  //   description:
+  //     'CoNote.ai is a start-up technology that helps researchers transcribe, analyze, and organize their data while collaborating with their team.'
+  // },
   'UCSD Design Lab': {
     name: 'UCSD Design Lab',
     org_type: 'Recruiting',
@@ -52,13 +52,13 @@ export const companies: CompaniesMap = {
     description:
       "Google is a global technology leader known for its search engine, online advertising, and diverse range of products. Beginning as an online search firm, it has expanded to include services such as Google Cloud, YouTube, and Android. Committed to innovation, Google's mission is to organize the world's information and make it universally accessible and useful."
   },
-  Deloitte: {
-    name: 'Deloitte',
-    org_type: 'Networking Only',
-    companyImage: 'images/company-images/deloitte.svg',
-    description:
-      'With more than 100,000 professionals, Deloitte provides audit and assurance, tax, consulting, and risk and financial advisory services to a broad cross-section of the largest corporations and governmental agencies.'
-  },
+  // Deloitte: {
+  //   name: 'Deloitte',
+  //   org_type: 'Networking Only',
+  //   companyImage: 'images/company-images/deloitte.svg',
+  //   description:
+  //     'With more than 100,000 professionals, Deloitte provides audit and assurance, tax, consulting, and risk and financial advisory services to a broad cross-section of the largest corporations and governmental agencies.'
+  // },
   Illumina: {
     name: 'Illumina',
     org_type: 'Networking Only',

diff --git a/src/components/About/RegisterButton/RegisterButton.tsx b/src/components/About/RegisterButton/RegisterButton.tsx
@@ -21,19 +21,19 @@ export default function RegisterButton() {
             />
             <path
               fill-rule="evenodd"
-              clip-rule="evenodd"
+              clipRule="evenodd"
               d="M229.177 204.374C218.451 179.82 219.791 148.923 223.71 129.823L212.031 132.63C207.788 138.739 205.048 145.482 204.103 152.728C201.691 171.226 211.423 189.558 229.177 204.374Z"
               fill="#1F1F1F"
             />
             <path
               fill-rule="evenodd"
-              clip-rule="evenodd"
+              clipRule="evenodd"
               d="M223.381 135.271C225.458 145.27 233.771 163.962 252.609 166.929C277.074 170.783 315.231 146.59 319.774 118.013C323.409 95.1521 278.551 106.966 255.668 115.73L224.479 133.398C224.531 133.299 224.582 133.2 224.631 133.103C222.866 130.54 218.018 125.85 212.75 127.594C211.164 128.12 209.895 129.311 208.889 130.838C204.675 137.236 210.973 146.217 217.262 141.842C219.811 140.069 221.916 137.547 223.381 135.271Z"
               fill="#030303"
             />
             <path
               fill-rule="evenodd"
-              clip-rule="evenodd"
+              clipRule="evenodd"
               d="M285.361 95.9996C301.855 75.993 337.508 65.5073 376.205 70.5535C401.446 73.8452 423.593 83.1501 438.986 95.6655C454.343 108.153 463.278 124.13 461.124 140.643L460.802 143.116L460.703 143.103C460.525 143.984 460.316 144.855 460.077 145.714L460.099 145.717L459.866 146.447C459.732 146.895 459.59 147.34 459.441 147.783L459.195 148.557C450.27 176.603 433.084 196.246 418.181 208.855C410.726 215.162 403.825 219.726 398.776 222.718C396.251 224.214 394.187 225.319 392.745 226.054C392.024 226.421 391.459 226.696 391.069 226.881C390.874 226.974 390.723 227.044 390.618 227.092C390.566 227.116 390.525 227.135 390.496 227.148L390.486 227.152C368.102 237.924 337.991 242.442 305.956 238.264C275.042 234.233 247.942 222.837 229.13 207.54C210.353 192.271 199.53 172.821 202.141 152.804C202.737 148.23 204.009 143.851 205.886 139.699C204.604 136.666 204.595 132.842 206.763 129.522C207.956 127.696 209.636 126.002 211.958 125.233C213.37 124.766 214.756 124.647 216.07 124.774C230.958 109.047 256.086 98.7066 285.361 95.9996ZM388.403 222.615L388.405 222.614L388.425 222.605C388.444 222.596 388.475 222.582 388.518 222.563C388.603 222.524 388.734 222.463 388.909 222.38C389.258 222.214 389.782 221.959 390.46 221.614C391.815 220.923 393.785 219.869 396.211 218.432C401.065 215.555 407.731 211.149 414.936 205.053C428.841 193.288 444.689 175.286 453.479 149.882L453.37 149.868L454.427 146.95C455.246 144.693 455.835 142.378 456.146 139.994L456.262 139.105C457.685 125.219 450.11 111.145 435.821 99.5268C421.26 87.6876 400.027 78.6888 375.56 75.4982C337.218 70.4981 303.263 81.3185 288.62 99.9277L287.949 100.78L286.866 100.873C257.28 103.412 232.659 113.886 218.856 129.125L217.855 130.23L216.403 129.876C215.457 129.646 214.508 129.646 213.543 129.966C212.665 130.256 211.79 130.978 210.963 132.244C209.646 134.26 209.806 136.665 210.828 138.425L211.491 139.567L210.918 140.754C208.979 144.773 207.686 149.015 207.107 153.451C204.802 171.129 214.28 189.03 232.295 203.679C250.276 218.3 276.461 229.389 306.601 233.319C337.854 237.395 366.966 232.938 388.332 222.648L388.367 222.631L388.402 222.615L388.403 222.615Z"
               fill="#FBFEFC"
             />
@@ -67,7 +67,7 @@ export default function RegisterButton() {
             />
             <path
               fill-rule="evenodd"
-              clip-rule="evenodd"
+              clipRule="evenodd"
               d="M305.326 96.0988C302.08 120.989 274.543 137.918 243.821 133.912C220.656 130.891 202.295 116.831 196.054 99.4269C195.472 95.6459 195.409 91.7744 195.918 87.87C199.477 60.581 229.66 42.0189 263.334 46.4102C266.376 46.8069 269.343 47.3773 272.22 48.107C293.912 56.8352 307.949 75.9889 305.326 96.0988Z"
               fill="#4EA664"
             />
@@ -108,7 +108,7 @@ export default function RegisterButton() {
             />
             <path
               fill-rule="evenodd"
-              clip-rule="evenodd"
+              clipRule="evenodd"
               d="M220.273 95.3519C218.694 98.4244 215.113 102.034 207.859 104.926C194.804 110.132 181.186 120.866 187.614 127.545C212.503 134.213 251.708 133.132 245.93 121.592C245.289 120.308 244.217 119.278 243.016 118.478L243.018 118.465C234.685 112.901 229.986 106.966 226.056 102.002C224.056 99.4746 222.254 97.1989 220.273 95.3519Z"
               fill="#F57F17"
             />
@@ -125,7 +125,7 @@ export default function RegisterButton() {
             />
             <path
               fill-rule="evenodd"
-              clip-rule="evenodd"
+              clipRule="evenodd"
               d="M417.529 105.17C424.164 107.323 429.503 111.443 431.746 117.531L431.747 117.533L429.404 118.394C431.747 117.533 431.747 117.534 431.747 117.535L431.748 117.536L431.749 117.541L431.754 117.554L431.77 117.598C431.784 117.636 431.802 117.689 431.826 117.757C431.874 117.893 431.941 118.089 432.025 118.342C432.192 118.848 432.424 119.581 432.693 120.512C433.231 122.372 433.918 125.03 434.523 128.252C435.727 134.663 436.629 143.397 435.341 152.559C435.099 155.282 434.492 158.016 433.591 160.717C433.577 160.767 433.565 160.811 433.555 160.845C433.543 160.885 433.536 160.911 433.528 160.939L432.948 163.024L432.756 162.999C426.188 179.41 408.338 195.106 384.889 203.77L384.888 203.771C367.552 210.168 350.14 211.637 335.95 208.716C321.801 205.804 310.457 198.408 306.163 186.743C302.758 177.488 304.48 167.362 309.768 157.901C315.048 148.456 323.957 139.502 335.341 132.298C352.521 120.57 372.429 109.215 393.391 104.623L393.402 104.62L394.256 104.442L394.266 104.44L394.275 104.438C402.736 102.738 410.891 103.016 417.529 105.17ZM395.258 109.332L395.262 109.332L395.266 109.331C403.065 107.765 410.326 108.081 415.988 109.919C421.656 111.757 425.504 115.026 427.062 119.257L427.072 119.283C427.081 119.308 427.095 119.349 427.115 119.404C427.153 119.514 427.211 119.684 427.286 119.909C427.435 120.36 427.648 121.032 427.899 121.898C428.4 123.632 429.046 126.133 429.618 129.175C430.764 135.275 431.59 143.455 430.39 151.925L430.381 151.992L430.375 152.059C430.173 154.39 429.646 156.79 428.828 159.223L428.751 159.454L428.75 159.462C423.489 174.685 406.64 190.412 383.161 199.087C366.557 205.215 350.097 206.531 336.956 203.827C323.773 201.113 314.327 194.473 310.846 185.018C308.08 177.499 309.331 168.913 314.125 160.337C318.921 151.757 327.187 143.359 338.045 136.494L338.083 136.471L338.119 136.446C355.141 124.822 374.421 113.892 394.447 109.502C394.451 109.501 394.455 109.5 394.459 109.499L395.221 109.34L395.258 109.332Z"
               fill="#FBFEFC"
             />

diff --git a/src/components/Navbar/MobileHomeNav/MobileHomeNav.scss b/src/components/Navbar/MobileHomeNav/MobileHomeNav.scss
@@ -7,6 +7,13 @@
   font-weight: 500;
   font-size: 1.25rem;
   justify-content: center;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: black;
+  margin-inline: auto;
+  z-index: 1;
 
   @media (min-width: 480px) {
     gap: 1rem;