diff --git a/.vscode/settings.json b/.vscode/settings.json index 13ee2b0..75b68d6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,10 @@ { - "nuxt.isNuxtApp": false + "nuxt.isNuxtApp": false, + "spellright.language": [ + "en" + ], + "spellright.documentTypes": [ + "latex", + "plaintext" + ] } \ No newline at end of file diff --git a/content/teams/Combat/index.md b/content/teams/Combat/index.md index 922ed3a..0977b8b 100644 --- a/content/teams/Combat/index.md +++ b/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. --- diff --git a/content/teams/DroneRacing/index.md b/content/teams/DroneRacing/index.md index 592ebcc..db2fed5 100644 --- a/content/teams/DroneRacing/index.md +++ b/content/teams/DroneRacing/index.md @@ -7,7 +7,7 @@ full_title: Drone Racing Team weight: 40 teamLeadName: Felix Klein teamLeadEmail: kleinf@oregonstate.edu -meeting: Sun 10 AM @ Merryfield 103 +meeting: Sun 10 AM @ Merryfield 110 gallery: - image0.jpg - PXL_20230331_172326598.jpg diff --git a/content/teams/Underwater/index.md b/content/teams/Underwater/index.md index 9d6b8ef..6817e85 100644 --- a/content/teams/Underwater/index.md +++ b/content/teams/Underwater/index.md @@ -7,7 +7,7 @@ full_title: Underwater Team weight: 30 teamLeadName: Michael Gallina teamLeadEmail: gallinam@oregonstate.edu -meeting: Su 12 PM @ Merryfield 103A +meeting: Su 12 PM @ Merryfield 110 gallery: - 20240211_131532.jpg - underwater frame.jpg diff --git a/content/teams/VexU/index.md b/content/teams/VexU/index.md index 8d1202d..29423cc 100644 --- a/content/teams/VexU/index.md +++ b/content/teams/VexU/index.md @@ -13,7 +13,7 @@ gallery: - render.jpg teamLeadName: Paul Smith teamLeadEmail: smithp8@oregonstate.edu -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. --- diff --git a/layouts/_default/leadershipPage.html b/layouts/_default/leadershipPage.html index b5952fe..11789a3 100644 --- a/layouts/_default/leadershipPage.html +++ b/layouts/_default/leadershipPage.html @@ -29,8 +29,17 @@

Board of Business: Grace Sopko

sokog@oregonstate.edu

-
-
+
+
+ +

Marketing: Reina Takahara

+

+
+
+ Marketing +

Marketing: Escher Wright-Dykhouse

+

+
Rover lead

Rover lead: Olivia Gerhke

diff --git a/static/css/styles.css b/static/css/styles.css index 5437c33..32372ec 100644 --- a/static/css/styles.css +++ b/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; } diff --git a/static/images/leadership/Website.jpg b/static/images/leadership/Website.jpg new file mode 100644 index 0000000..5cb8b88 Binary files /dev/null and b/static/images/leadership/Website.jpg differ