merge s2025 sgj stuff

Author: Nihal-Pinto

src/app/pages/scarlet-game-jam/scarlet-game-jam/scarlet-game-jam-page.component.html

@@ -63,8 +63,12 @@ <h1>🎸 VGM Club</h1>
         First in-person meetup of Scarlet Game Jam. This is the time to meet other people participating in the jam and
         form groups. The meetup marks the official start of Scarlet Game Jam and will be the reveal of the big theme of
         the game jam.
+<<<<<<< HEAD
         <br>
         <br>
+=======
+        <br><br>
+>>>>>>> 0b9a906b8a141872aacd03ebf703bc3dafc33295
         Located at the CoRE 301 room.
         <br>
         <br>
@@ -80,8 +84,12 @@ <h1>🎸 VGM Club</h1>
         The final part of Scarlet Game Jam, this is where you will race to finish up your project, showcase your final
         work, and see everyone else's projects as well. This is the main event of Scarlet Game Jam and it will be a lot
         of fun.
+<<<<<<< HEAD
         <br>
         <br>
+=======
+        <br><br>
+>>>>>>> 0b9a906b8a141872aacd03ebf703bc3dafc33295
         Located in the Collaborative Learning Center at the Livingston Student Center.
         <br>
         <br>

src/app/pages/scarlet-showcase/scarlet-showcase/_scarlet-showcase-page.component-theme.scss

@@ -10,19 +10,19 @@
     color: mat.get-color-from-palette($primary, 500-contrast);
   }
 
-  .logo-container {
+  .app-scarlet-showcase.logo-container {
     max-height: 50em;
     flex-grow: 1;
     margin-top: -7em;
   }
 
   @media screen and (max-width: variables.$mobile-width) {
-    .logo-container {
+    .app-scarlet-showcase.logo-container {
       margin-top: -3em;
     }
   }
 
-  .theme {
+  .app-scarlet-showcase.theme {
     ul,
     div,
     ol,

src/app/pages/scarlet-showcase/scarlet-showcase/scarlet-showcase-page.component.html

@@ -68,7 +68,7 @@
       </div>
     </div>
   </app-full-page-header>
-  <app-section color="none" class="theme">
+  <app-section color="none" class="app-scarlet-showcase theme">
     <div style="width: 100vw"></div>
     <div style="display: flex; gap: 4em; flex-direction: column;">
       <div>
@@ -285,4 +285,4 @@ <h2>Awards Ceremony</h2>
       </div>
     </div>
   </app-section>
-</div>
+</div>