Merge branch 'main' of https://github.com/OSURoboticsClub/osurc-website

.vscode/settings.json

@@ -1,3 +1,10 @@
 {
-    "nuxt.isNuxtApp": false
+    "nuxt.isNuxtApp": false,
+    "spellright.language": [
+        "en"
+    ],
+    "spellright.documentTypes": [
+        "latex",
+        "plaintext"
+    ]
 }

content/teams/Combat/index.md

@@ -12,7 +12,7 @@ gallery:
     - Copy of CR_Post_1_Photo_2.JPG
     - Copy of CR_Post_1_Photo_3.jpg
     - Copy of CR_Post_1_Photo_4.jpg
-meeting: Fri 1 - 5 PM @ Merryfield 103
+meeting: Fri 1-5 PM @ Merryfield 110
 tagline: DAM Robotics' Combat Robotics team centers on building and competing with lightweight robots.
 ---
 

content/teams/DroneRacing/index.md

@@ -7,7 +7,7 @@ full_title: Drone Racing Team
 weight: 40
 teamLeadName: Felix Klein
 teamLeadEmail: [email protected]
-meeting: Sun 10 AM @ Merryfield 103
+meeting: Sun 10 AM @ Merryfield 110
 gallery:
     - image0.jpg
     - PXL_20230331_172326598.jpg

content/teams/Underwater/index.md

@@ -7,7 +7,7 @@ full_title: Underwater Team
 weight: 30
 teamLeadName: Michael Gallina
 teamLeadEmail: [email protected]
-meeting: Su 12 PM @ Merryfield 103A
+meeting: Su 12 PM @ Merryfield 110
 gallery:
     - 20240211_131532.jpg
     - underwater frame.jpg

content/teams/VexU/index.md

@@ -13,7 +13,7 @@ gallery:
     - render.jpg
 teamLeadName: Paul Smith
 teamLeadEmail: [email protected]
-meeting: M/F 5-8 PM and Sat/Sun 2-6 PM @ Merryfield 103
+meeting: T/Th 4-9 PM @ Merryfield 110
 tagline: The DAM Robotics VEX U team focuses on designing multiple robots and competing in the VEX Robotics competition at the university level.
 ---
 

layouts/_default/leadershipPage.html

@@ -29,8 +29,17 @@
                         <p style="color:#F97316; padding-top:15px;">Board of Business: Grace Sopko </p>
                         <p>[email protected]</p>
                     </div>
-                    <div class="w-full"></div>
-                    <div class="w-full"></div>
+                    <div>
+                        <div class="w-full h-60 bg-neutral-800 image-shadow"></div>
+                        <!-- <img src="/images/leadership/Website.jpg" alt="Marketing" class="w-full h-60 object-cover image-shadow bg-gray-800"> -->
+                        <p style="color:#F97316; padding-top:15px;">Marketing: Reina Takahara </p>
+                        <p></p>
+                    </div>
+                    <div>
+                        <img src="/images/leadership/Website.jpg" alt="Marketing" class="w-full h-60 object-cover image-shadow">
+                        <p style="color:#F97316; padding-top:15px;">Marketing: Escher Wright-Dykhouse </p>
+                        <p></p>
+                    </div>
                     <div>
                         <img src="/images/leadership/Rover.png" alt="Rover lead" class="w-full h-60 object-cover image-shadow">
                         <p style="color:#F97316; padding-top:15px;">Rover lead: Olivia Gerhke </p>

static/css/styles.css

@@ -1359,6 +1359,10 @@ video {
 .bg-white\/10 {
   background-color: rgb(255 255 255 / 0.1);
 }
+.bg-gray-800 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
+}
 .bg-opacity-40 {
   --tw-bg-opacity: 0.4;
 }