Merge branch 'page/comnk/about-page' into develop

ucsddesignco · Nov 7, 2024 · 463d235 · 463d235
2 parents 4ad2371 + 4e5b12a
commit 463d235
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 54 deletions.
diff --git a/src/components/About/Companies/CompaniesSVG/CompaniesSVG.scss b/src/components/About/Companies/CompaniesSVG/CompaniesSVG.scss
@@ -8,7 +8,7 @@
   }
 
   @media (min-width: $tablet-breakpoint) {
-    max-width: none;
+    max-width: 1000px;
     width: 100%;
   }
 
@@ -114,16 +114,16 @@
 
   #about-companies-mascot {
     position: absolute;
-    top: 0;
-    right: 30%;
-    transform: translateY(-53%);
-    width: 20%;
+    height: auto;
+    width: 22%;
+    top: -14%;
+    right: 20%;
+    rotate: -90deg;
 
     @media (min-width: 400px) {
-      top: 38%;
-      right: 0;
-      transform: translateY(-40%);
-      rotate: 90deg;
+      top: 34%;
+      right: -10%;
+      rotate: none;
     }
   }
 

diff --git a/src/components/About/Companies/MascotTopFolder.tsx b/src/components/About/Companies/MascotTopFolder.tsx
@@ -5,50 +5,114 @@ export default function MascotTopFolder(props: SVGProps<SVGSVGElement>) {
     <svg
       {...props}
       id="about-companies-mascot"
-      width="56"
-      viewBox="0 0 56 47"
-      fill="none"
       xmlns="http://www.w3.org/2000/svg"
+      width="250"
+      height="326"
+      viewBox="0 0 250 326"
+      fill="none"
     >
-      <path
-        d="M34.4335 6.69439C34.064 6.3244 33.4644 6.32462 33.0951 6.69488C32.5787 7.21271 32.0569 7.65008 31.5271 8.01236C31.8855 7.37925 32.0887 6.64697 32.0884 5.86648C32.0875 3.45528 30.1355 1.50342 27.7319 1.5043C25.3282 1.50517 23.3776 3.46113 23.3785 5.86965C23.3788 6.65282 23.5851 7.38496 23.9467 8.02048C22.999 7.39054 22.4313 6.75777 22.4152 6.74168C22.0698 6.34754 21.4729 6.31021 21.0822 6.65366C20.6888 6.99711 20.6489 7.59791 20.9917 7.99206C21.1015 8.11807 23.7016 11.0487 27.5212 11.176C27.6096 11.1787 27.6952 11.1813 27.7836 11.1813C30.1176 11.1804 32.3523 10.1229 34.4366 8.03276C34.8059 7.66249 34.8057 7.0617 34.4361 6.69171L34.4335 6.69439Z"
-        fill="#231F20"
-        stroke="#231F20"
-        stroke-width="0.653844"
-        stroke-miterlimit="10"
-      />
-      <path
-        d="M27.7457 40.3169C36.9539 40.3135 44.4165 34.2287 44.4137 26.726C44.411 19.2233 36.944 13.1439 27.7358 13.1473C18.5275 13.1506 11.065 19.2354 11.0677 26.7381C11.0704 34.2408 18.5374 40.3202 27.7457 40.3169Z"
-        fill="#3D6C36"
-      />
-      <path
-        d="M16.5787 32.5268C17.3016 32.5265 17.8873 31.7494 17.887 30.791C17.8866 29.8326 17.3003 29.0559 16.5774 29.0562C15.8546 29.0564 15.2688 29.8336 15.2692 30.792C15.2695 31.7503 15.8558 32.5271 16.5787 32.5268Z"
-        fill="#3C2415"
-      />
-      <path
-        d="M17.0193 30.3274C17.1967 30.3273 17.3404 30.1364 17.3403 29.9008C17.3402 29.6653 17.1963 29.4744 17.019 29.4745C16.8416 29.4746 16.6978 29.6655 16.6979 29.9011C16.698 30.1366 16.8419 30.3275 17.0193 30.3274Z"
-        fill="#FBFEFC"
-      />
-      <path
-        d="M38.9957 32.519C39.7186 32.5187 40.3043 31.7416 40.304 30.7832C40.3036 29.8248 39.7173 29.0481 38.9944 29.0484C38.2716 29.0486 37.6858 29.8258 37.6862 30.7841C37.6865 31.7425 38.2728 32.5192 38.9957 32.519Z"
-        fill="#3C2415"
-      />
-      <path
-        d="M39.4365 30.3196C39.6139 30.3195 39.7576 30.1285 39.7575 29.893C39.7575 29.6575 39.6136 29.4666 39.4362 29.4667C39.2588 29.4667 39.1151 29.6577 39.1151 29.8933C39.1152 30.1288 39.2591 30.3197 39.4365 30.3196Z"
-        fill="#FBFEFC"
-      />
-      <path
-        d="M37.1425 38.3211C33.8069 37.1985 32.5214 35.1606 32.1785 34.4875C31.4311 32.7203 29.7282 31.4871 27.7422 31.4879C25.7561 31.4886 24.2013 32.6237 23.4096 34.2735L23.4096 34.2681C23.4096 34.2681 22.3667 36.9881 18.304 38.3441C16.7812 38.8703 15.874 39.5251 15.8743 40.2358C15.8749 41.9577 21.1886 43.3532 27.7438 43.3508C34.299 43.3484 39.6117 41.9491 39.611 40.2272C39.6108 39.5111 38.6871 38.8489 37.1398 38.3238L37.1425 38.3211Z"
-        fill="#F7941D"
-      />
-      <path
-        d="M51.3274 43.0751C50.0878 45.8393 46.195 45.926 44.8335 43.2197L42.4938 38.5685C41.3064 36.2081 42.9847 33.416 45.6263 33.3572L50.0965 33.2577C52.7381 33.1988 54.539 35.9135 53.4578 38.3244L51.3274 43.0751Z"
-        fill="#553618"
-      />
-      <path
-        d="M10.161 42.459C8.92141 45.2232 5.02861 45.3099 3.66718 42.6036L1.32741 37.9524C0.13999 35.592 1.81831 32.7999 4.4599 32.7411L8.93012 32.6416C11.5717 32.5827 13.3727 35.2974 12.2915 37.7083L10.161 42.459Z"
-        fill="#553618"
-      />
+      <g clip-path="url(#clip0_6618_10149)">
+        <path
+          d="M37.9003 162.999C37.9003 211.388 69.8833 250.615 109.336 250.615C148.789 250.615 180.772 211.388 180.772 162.999C180.772 114.611 148.789 75.3838 109.336 75.3838C69.8833 75.3838 37.9003 114.611 37.9003 162.999Z"
+          fill="#319855"
+        />
+        <path
+          d="M58.0303 157.847C58.0303 196.883 83.8585 228.528 115.719 228.528C147.58 228.528 173.408 196.883 173.408 157.847C173.408 118.81 147.58 87.165 115.719 87.165C83.8585 87.165 58.0303 118.81 58.0303 157.847Z"
+          fill="#4EA664"
+        />
+        <path
+          d="M48.4002 211.249C54.2606 193.87 64.8903 187.175 68.4009 185.389C77.618 181.498 84.0518 172.627 84.0518 162.277C84.0518 151.928 78.1355 143.824 69.5338 139.695L69.5618 139.695C69.5618 139.695 55.3795 134.255 48.3163 113.082C45.575 105.145 42.1623 100.417 38.4559 100.417C29.4765 100.417 22.1896 128.104 22.1896 162.263C22.1896 196.422 29.4765 224.11 38.4558 224.11C42.1902 224.11 45.6449 219.298 48.3863 211.235L48.4002 211.249Z"
+          fill="#F7941D"
+        />
+        <path
+          d="M15.7627 52.7557C1.4129 45.9166 1.41291 25.4453 15.7627 18.6062L40.4048 6.86166C52.9204 0.896656 67.3652 10.045 67.3652 23.9365L67.3652 47.4255C67.3652 61.317 52.9204 70.4653 40.4048 64.5003L15.7627 52.7557Z"
+          fill="#1F1F1F"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M13.611 57.2673C-4.53658 48.6181 -4.53655 22.7425 13.611 14.0933L38.2532 2.3488C54.1063 -5.20686 72.3652 6.39065 72.3652 23.9358L72.3652 47.4249C72.3652 64.97 54.1062 76.5675 38.2531 69.0118L13.611 57.2673ZM15.7627 52.7551C1.41289 45.9159 1.4129 25.4447 15.7627 18.6055L40.4048 6.861C52.9204 0.896001 67.3652 10.0443 67.3652 23.9358L67.3652 47.4249C67.3652 61.3164 52.9204 70.4646 40.4048 64.4996L15.7627 52.7551Z"
+          fill="#FBFEFC"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M5.89562 29.8496C3.22583 38.2824 6.51419 48.3495 15.7607 52.7564L40.4028 64.5009C50.8758 69.4924 62.6995 63.9013 66.2801 53.8038C66.749 52.321 67.0422 50.7468 67.1309 49.0996C62.4694 57.2247 52.0177 61.2303 42.6474 56.7644L18.0053 45.0199C10.441 41.4147 6.86412 34.0216 7.27465 26.834C6.72292 27.8019 6.26324 28.8117 5.89562 29.8496Z"
+          fill="#141414"
+        />
+        <path
+          d="M15.7617 307.393C1.41192 300.554 1.41193 280.083 15.7617 273.244L40.4038 261.499C52.9195 255.534 67.3643 264.683 67.3643 278.574L67.3643 302.063C67.3643 315.955 52.9194 325.103 40.4038 319.138L15.7617 307.393Z"
+          fill="#1F1F1F"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M13.61 311.906C-4.53755 303.257 -4.53752 277.381 13.6101 268.732L38.2522 256.987C54.1053 249.432 72.3643 261.029 72.3643 278.574L72.3643 302.064C72.3643 319.609 54.1053 331.206 38.2522 323.65L13.61 311.906ZM15.7617 307.394C1.41191 300.555 1.41193 280.083 15.7617 273.244L40.4038 261.5C52.9195 255.535 67.3643 264.683 67.3643 278.574L67.3643 302.064C67.3643 315.955 52.9194 325.103 40.4038 319.138L15.7617 307.394Z"
+          fill="#FBFEFC"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M7.25966 281.264C2.46335 290.177 5.29703 302.412 15.7607 307.399L40.4028 319.144C46.2504 321.931 52.519 321.418 57.5388 318.665C62.8805 315.649 66.7623 310.076 67.1299 303.248C62.4684 311.373 52.0167 315.379 42.6464 310.913L18.0043 299.168C10.5386 295.61 6.95704 288.362 7.25966 281.264Z"
+          fill="#141414"
+        />
+        <path
+          d="M216.907 199.304C218.89 197.335 218.91 194.115 216.94 192.132C214.18 189.364 211.842 186.531 209.914 183.7C213.301 185.636 217.206 186.737 221.376 186.761C234.272 186.816 244.767 176.385 244.8 163.492C244.854 150.597 234.421 140.102 221.529 140.068C217.338 140.047 213.407 141.152 210.011 143.059C213.394 138.002 216.786 134.952 216.882 134.872C218.993 133.034 219.209 129.828 217.371 127.716C215.533 125.604 212.323 125.367 210.211 127.205C209.545 127.783 193.799 141.661 193.04 162.134C193.027 162.611 193.012 163.067 193.02 163.541C192.971 176.047 198.588 188.065 209.713 199.273C211.683 201.256 214.902 201.276 216.886 199.307L216.907 199.304Z"
+          fill="#565656"
+        />
+        <mask
+          id="mask0_6618_10149"
+          style={{ maskType: 'alpha' }}
+          maskUnits="userSpaceOnUse"
+          x="193"
+          y="125"
+          width="52"
+          height="76"
+        >
+          <path
+            d="M216.907 199.304C218.89 197.335 218.91 194.115 216.94 192.132C214.18 189.364 211.842 186.531 209.914 183.7C213.301 185.636 217.206 186.737 221.376 186.761C234.272 186.816 244.767 176.385 244.8 163.492C244.854 150.597 234.421 140.102 221.529 140.068C217.338 140.047 213.407 141.152 210.011 143.059C213.394 138.002 216.786 134.952 216.882 134.872C218.993 133.034 219.209 129.828 217.371 127.716C215.533 125.604 212.323 125.367 210.211 127.205C209.545 127.783 193.799 141.661 193.04 162.134C193.027 162.611 193.012 163.067 193.02 163.541C192.971 176.047 198.588 188.065 209.713 199.273C211.683 201.256 214.902 201.276 216.886 199.307L216.907 199.304Z"
+            fill="#434343"
+          />
+        </mask>
+        <g mask="url(#mask0_6618_10149)">
+          <path
+            d="M197.931 137.616C196.187 136.402 185.001 160.673 183.075 160.971L201.153 204.712L238.829 207.524C239.379 204.288 253.917 163.414 251.859 160.793C247.109 154.741 240.34 161.214 235.32 163.532C229.78 166.09 223.183 167.673 217.054 167.808C213.382 167.889 209.592 166.944 207.128 164.051C204.241 160.661 205.364 156.052 204.844 152.008C204.476 149.151 204.184 146.138 202.861 143.536C201.739 141.33 199.996 139.053 197.931 137.616Z"
+            fill="#434343"
+          />
+        </g>
+        <path
+          d="M82.5455 114.888C87.9683 114.888 92.3641 111.701 92.3639 107.771C92.3636 103.84 87.9673 100.653 82.5445 100.653C77.1217 100.653 72.7258 103.84 72.7261 107.771C72.7264 111.701 77.1227 114.888 82.5455 114.888Z"
+          fill="black"
+        />
+        <path
+          d="M85.3665 112.927C87.7136 112.927 89.6163 111.539 89.6162 109.826C89.616 108.114 87.7132 106.726 85.3661 106.726C83.0189 106.726 81.1163 108.114 81.1164 109.826C81.1166 111.539 83.0194 112.927 85.3665 112.927Z"
+          fill="#FBFEFC"
+        />
+        <path
+          d="M82.3228 225.33C87.7457 225.33 92.1415 222.144 92.1412 218.213C92.1409 214.282 87.7446 211.096 82.3218 211.096C76.899 211.096 72.5032 214.282 72.5034 218.213C72.5037 222.144 76.9 225.33 82.3228 225.33Z"
+          fill="black"
+        />
+        <path
+          d="M85.1438 223.369C87.491 223.369 89.3936 221.981 89.3935 220.269C89.3934 218.556 87.4905 217.168 85.1434 217.168C82.7963 217.168 80.8937 218.556 80.8938 220.269C80.8939 221.981 82.7967 223.369 85.1438 223.369Z"
+          fill="#FBFEFC"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M84.0056 161.435C68.8708 163.011 51.1909 168.663 46.5676 183.51C41.4282 200.014 36.2888 210.037 28.7861 211.855C31.4924 219.521 34.8469 224.057 38.4785 224.057C42.2083 224.057 45.6587 219.249 48.3967 211.193L48.4107 211.207C54.2639 193.841 64.8806 187.15 68.3869 185.366C77.5927 181.478 84.0186 172.614 84.0186 162.272C84.0186 161.991 84.0142 161.712 84.0056 161.435Z"
+          fill="#F57F17"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_6618_10149">
+          <rect
+            width="326"
+            height="250"
+            fill="white"
+            transform="translate(249.999) rotate(90)"
+          />
+        </clipPath>
+      </defs>
     </svg>
   );
 }
diff --git a/src/components/About/FAQ/constants.ts b/src/components/About/FAQ/constants.ts
@@ -2,7 +2,7 @@ export const FAQData = [
   {
     title: 'When Is Stride?',
     content:
-      'Stride takes place on Wednesday, November 13th, 2024. It will be from 10am-2pm at the Price Center Ballroom East.'
+      'Stride takes place on Wednesday, November 13th, 2024. It will be from 10am-2pm at the Design & Innovation Building Room 208.'
   },
   {
     title: 'Where is Stride?',

diff --git a/src/components/About/Opportunities/Opportunities.scss b/src/components/About/Opportunities/Opportunities.scss
@@ -10,6 +10,7 @@
 
     p {
       font-size: 35px;
+      margin: 0;
     }
   }
 
@@ -20,8 +21,7 @@
       align-items: center;
       justify-content: center;
       max-width: fit-content;
-      margin-left: auto;
-      margin-right: auto;
+      margin-inline: auto;
       margin-block: auto;
     }
   }