Merge remote-tracking branch 'origin/main'

# Conflicts: # index.html
TitaniumTigers4829 · Nov 21, 2023 · 5207239 · 5207239
2 parents 9bb8ce2 + 746050c
commit 5207239
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 53 deletions.
diff --git a/index.html b/index.html
@@ -17,7 +17,19 @@
 <body>
 
 <header>
-
+  <div id="header-interest-form">
+    <p>If you are interested in joining Titanium Tigers, complete our form:</p>
+    <a class="header-button"
+       href="https://docs.google.com/forms/d/e/1FAIpQLScZroxdy3WQmwxDN6p1T9dN80Uwpewk7a3u133SZAjkAeQEkQ/viewform?usp=sf_link"
+       target="_blank">Sign Up Form</a>
+  </div>
+  <button id="x-button" onclick="closeSignupPopup()">✖</button>
+  <input id="main-nav-toggle" type="checkbox"/>
+  <label class="main-nav-button-container" for="main-nav-toggle">
+    <div class="main-nav-button" id="top-nav-button"></div>
+    <div class="main-nav-button" id="mid-nav-button"></div>
+    <div class="main-nav-button" id="bot-nav-button"></div>
+  </label>
   <div id="header-inner">
     <a class="header-item one" href="#">
       Home
@@ -119,7 +131,8 @@ <h2>Support Us</h2>
   <div id="video-container">
     <h2>FRC Challenge Videos</h2>
     <p>
-      This is the official game video for the 2023 season Charged Up and the teaser for the 2024 season Crescendo.
+      These are the official game videos for the 2023 season Charged Up and the 2022 season Rapid
+      React.
     </p>
     <div id="videos-div">
       <iframe src="https://www.youtube.com/embed/pTvP165wi3E"></iframe>

diff --git a/scripts/x_button.js b/scripts/x_button.js
diff --git a/styles/header.css b/styles/header.css
@@ -5,51 +5,6 @@ header {
   background: var(--secondaryColor);
 }
 
-#header-interest-form {
-  width: 100%;
-  padding: .5% 25%;
-  display: flex;
-  flex-direction: row;
-  gap: 3%;
-  background-color: var(--themeColor);
-}
-
-#header-interest-form p {
-  margin: 0;
-  padding: 1% 0;
-  font-size: 1.3vw;
-}
-
-#header-interest-form a {
-  margin: 0;
-  font-size: 1.3vw;
-  color: var(--mainTextColor);
-  border: 1px solid var(--mainTextColor);
-  border-radius: 5px;
-  padding: .9% 1% 1%;
-  text-decoration: none;
-}
-
-#header-interest-form a:hover {
-  backdrop-filter: brightness(1.15);
-}
-
-#x-button {
-  color: var(--mainTextColor);
-  background: transparent;
-  border: none;
-  font-size: 1.3vw;
-  position: absolute;
-  top: 8%;
-  right: 1%;
-  cursor: pointer;
-  font-family: Arial, serif;
-}
-
-#x-button:hover {
-  transform: rotate(180deg);
-}
-
 #header-inner {
   padding: 1.8% 20% 1.5%;
 }