Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Unknown 2024-09-13 11:58:49 -07:00
commit 414d0c13a4
14 changed files with 217 additions and 272 deletions

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,7 +7,8 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
window.addEventListener("DOMContentLoaded", (event) => {

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
@ -24,41 +26,32 @@
</script>
</head>
<body>
<body class="flex flex-col min-h-screen">
<!--Navigation Bar-->
<div id="navbar"></div>
<header id="navbar" class="mb-16"></header>
<!-- Body -->
<div class="Title-Container">
<h1 class="page-title" style="width: 100%; text-align: center">
Calendar
</h1>
<img
src="/Resources/Icons/calendar.png"
id="TeamIcon"
alt="Team Icon"
/>
</div>
<div
style="
display: flex;
justify-content: center;
text-align: center;
padding-top: 10%;
padding-bottom: 8%;
"
>
<iframe
src="https://calendar.google.com/calendar/embed?src=c_classroomf63767d2%40group.calendar.google.com&ctz=America%2FPhoenix"
style="border-width: 0"
width="800"
height="600"
frameborder="0"
scrolling="no"
></iframe>
</div>
<main class="flex-grow flex flex-col">
<div class="flex justify-center items-center">
<h1 class="text-3xl font-bold px-4">Calendar</h1>
<img
src="/Resources/Icons/calendar.png"
class="w-20"
alt="Team Icon"
/>
</div>
<div class="flex-grow relative overflow-hidden">
<iframe
class="absolute top-0 left-0 w-full h-full p-4"
src="https://calendar.google.com/calendar/embed?src=c_classroomf63767d2%40group.calendar.google.com&ctz=America%2FPhoenix"
style="border: 0"
frameborder="0"
scrolling="no"
></iframe>
</div>
</main>
<!-- Footer -->
<div id="socials"></div>
<footer id="socials"></footer>
</body>
</html>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>

View file

@ -1,46 +1,109 @@
<body>
<nav class="fill" id="nav-bar">
<ul>
<img
src="/Resources/Black Logo-1.png"
id="nav-logo"
alt="Team 1165 Logo"
/>
<li class="nav-button" id="home-dropdown">
<a href="/index.html">Home</a>
<nav class="dropdown-content" id="home-dropdown-content">
<a class="first-dropdown" href="/index.html">Projects</a>
<a href="/index.html">Leaders</a>
</nav>
<!-- Navbar -->
<nav
id="nav-bar"
class="fixed top-0 left-0 w-full bg-gray-100 border-b border-black text-sm z-50"
>
<ul
class="flex flex-wrap justify-center items-center m-0 p-0 list-none"
>
<li>
<img
src="/Resources/Black Logo-1.png"
id="nav-logo"
alt="Team 1165 Logo"
class="hidden md:inline w-[3.5vw] pr-[30%] align-middle"
/>
</li>
<li class="nav-button">
<a href="/Pages/calendar.html">Calendar</a>
</li>
<li class="nav-button">
<a href="/Pages/sponsors.html">Sponsors</a>
</li>
<li class="nav-button"><a href="/Pages/shop.html">Shop</a></li>
<li class="nav-button" id="donate-dropdown">
<a href="/Pages/donate.html">Donate</a>
<nav class="dropdown-content" id="donate-dropdown-content">
<a class="first-dropdown" href="/Pages/gen_donate.html"
>General Donation</a
>
<a href="/Pages/tax_credit_dono.html">Tax Credit</a>
</nav>
</li>
<li class="nav-button" id="Accomplishments-dropdown">
<a href="/index.html">Accomplishments</a>
<nav
class="dropdown-content"
id="Accomplishments-dropdown-content"
<li class="relative group">
<a
href="/index.html"
class="block p-2 md:p-4 text-xs md:text-sm lg:text-base text-black font-extrabold uppercase transition-all duration-200 ease-in-out hover:text-c3153a break-words whitespace-normal"
>
<a class="first-dropdown" href="/Pages/projects.html"
Home
</a>
<div
class="absolute left-0 top-full hidden group-hover:block bg-white border border-gray-300 text-center text-sm z-50"
>
<a
href="/index.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>Projects</a
>
<a href="/Pages/awards.html">Awards</a>
</nav>
<a
href="/index.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>Leaders</a
>
</div>
</li>
<li class="relative group">
<a
href="/Pages/calendar.html"
class="block p-2 md:p-4 text-xs md:text-sm lg:text-base text-black font-extrabold uppercase transition-all duration-200 ease-in-out hover:text-c3153a break-words whitespace-normal"
>
Calendar
</a>
</li>
<li class="relative group">
<a
href="/Pages/sponsors.html"
class="block p-2 md:p-4 text-xs md:text-sm lg:text-base text-black font-extrabold uppercase transition-all duration-200 ease-in-out hover:text-c3153a break-words whitespace-normal"
>
Sponsors
</a>
</li>
<li class="relative group">
<a
href="/Pages/shop.html"
class="block p-2 md:p-4 text-xs md:text-sm lg:text-base text-black font-extrabold uppercase transition-all duration-200 ease-in-out hover:text-c3153a break-words whitespace-normal"
>
Shop
</a>
</li>
<li class="relative group">
<a
href="/Pages/donate.html"
class="block p-2 md:p-4 text-xs md:text-sm lg:text-base text-black font-extrabold uppercase transition-all duration-200 ease-in-out hover:text-c3153a break-words whitespace-normal"
>
Donate
</a>
<div
class="absolute left-0 top-full hidden group-hover:block bg-white border border-gray-300 text-center text-sm z-50"
>
<a
href="/Pages/gen_donate.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>General Donation</a
>
<a
href="/Pages/tax_credit_dono.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>Tax Credit</a
>
</div>
</li>
<li class="relative group">
<a
href="/index.html"
class="block p-2 md:p-4 text-xs md:text-sm lg:text-base text-black font-extrabold uppercase transition-all duration-200 ease-in-out hover:text-c3153a break-words whitespace-normal"
>
Accomplishments
</a>
<div
class="absolute left-0 top-full hidden group-hover:block bg-white border border-gray-300 text-center text-sm z-50"
>
<a
href="/Pages/projects.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>Projects</a
>
<a
href="/Pages/awards.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>Awards</a
>
</div>
</li>
</ul>
</nav>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
@ -27,7 +29,7 @@
<body>
<!--Navigation Bar-->
<div id="navbar"></div>
<div id="mc_embed_shell">
<link
href="//cdn-images.mailchimp.com/embedcode/classic-061523.css"
@ -35,7 +37,12 @@
type="text/css"
/>
<style type="text/css">
#mc_embed_signup{background:#fff; false;clear:left; font:14px Helvetica,Arial,sans-serif; width: px;}
#mc_embed_signup {
background: #fff;
clear: left;
font: 14px Helvetica, Arial, sans-serif;
width: px;
}
/* Add your own Mailchimp form style overrides in your site stylesheet or in this style block.
We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
</style>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>

View file

@ -7,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
@ -25,6 +26,7 @@
</script>
<title>Showcase Page</title>
</head>
<body>
<!--Navigation Bar-->
<div id="navbar"></div>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
@ -116,7 +118,9 @@
•Robot Demonstration at Company (pending Sponsor request and
team availability)
</div>
<div class="sponsor-detail">•3D Model of our comeptition robot</div>
<div class="sponsor-detail">
•3D Model of our comeptition robot
</div>
<div class="sponsor-detail">
•Name and Logo on Competition Robot
</div>
@ -135,10 +139,10 @@
Gold Sponsor
</h2>
<div class="sponsor-amount">$1,500-$4,999</div>
<div class="sponsor-detail">•Name and Logo on Workbench</div>
<div class="sponsor-detail">
•Name and Logo on Workbench
•Name and Logo on comeptition Shirts
</div>
<div class="sponsor-detail">•Name and Logo on comeptition Shirts</div>
<div class="sponsor-detail">
•Name listed on team registration papers
</div>

View file

@ -36,152 +36,10 @@ body {
background-color: #f1f1f1;
}
/* Navigation Bar */
#nav-bar {
position: fixed;
z-index: 110;
background-color: #f1f1f1;
width: calc(100vw);
border-bottom: 1px solid;
border-bottom-color: #000;
margin: 0;
font-size: 1rem;
}
#nav-bar::after {
color: #000;
}
#nav-bar ul {
list-style: none;
text-align: center;
margin: 0;
padding: 0;
}
#nav-bar ul li {
display: inline-block;
}
#nav-bar ul li a {
display: block;
padding: 15px;
text-decoration: none;
color: #141415;
font-weight: 800;
text-transform: uppercase;
}
#nav-bar ul li nav.dropdown-content {
position: fixed;
top: 50;
}
#nav-bar ul li nav.dropdown-content::before {
position: absolute;
left: 50%;
top: auto;
width: 0;
height: 0;
border: solid transparent;
content: "";
}
#nav-logo {
width: calc(3.5vw);
vertical-align: middle;
padding-right: 30%;
display: none;
}
nav.fill ul .nav-button {
justify-content: right;
}
/* Hide Dropdown */
nav.fill ul .dropdown-content {
display: none;
position: absolute;
background-color: #f1f1f1;
border-color: #000;
border: 1px solid;
z-index: 110;
}
/* Dropdown Text */
nav.fill ul .dropdown-content a {
color: #f1f1f1;
}
/* Hover over dropdown text */
nav.fill ul .dropdown-content a:hover {
color: #000;
}
/* Show dropdown on hover */
nav.fill ul #home-dropdown:hover #home-dropdown-content {
display: block;
text-align: center;
font-size: small;
z-index: 110;
width: calc(10vw);
}
/* Show dropdown on hover */
nav.fill ul #donate-dropdown:hover #donate-dropdown-content {
display: block;
text-align: center;
z-index: 110;
width: calc(10vw);
}
/* Show dropdown on hover */
nav.fill ul #Accomplishments-dropdown:hover #Accomplishments-dropdown-content {
display: block;
text-align: center;
z-index: 110;
width: calc(10vw);
}
nav ul li a,
nav ul li a:after,
nav ul li a:before {
transition: all 0.2s;
}
nav ul li a:hover {
color: #000000;
}
nav.fill ul li a:after {
position: absolute;
bottom: 0;
left: 0;
right: 0;
width: 0%;
content: ".";
margin: 0;
opacity: 0;
color: transparent;
background: #aaa;
height: 1px;
}
nav.fill ul li a {
transition: all 1s;
}
nav.fill ul li a:hover {
color: #c3153a;
z-index: 1;
}
nav.fill ul li a:hover:after {
z-index: -10;
animation: fill 0.5s forwards;
-webkit-animation: fill 1s forwards;
-moz-animation: fill 1s forwards;
opacity: 1;
}
nav.fill ul li[tabindex]:hover .dropdown-content,
nav.fill ul li[tabindex]:focus .dropdown-content {
display: block;
}
main {
width: 100%;
background-color: #f1f1f1;
z-index: 100;
z-index: 10;
}
/* Logo + Background Image */
@ -196,7 +54,7 @@ main {
.logo-container #Logo-Image {
position: fixed;
z-index: 80;
z-index: 0;
width: auto;
height: auto;
max-width: calc(60vw);
@ -205,7 +63,7 @@ main {
.logo-container #Background-Image {
position: fixed;
z-index: 50;
z-index: 0;
width: calc(100vw);
height: calc(100vh);
object-fit: cover;
@ -340,7 +198,7 @@ main {
bottom: 20px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
z-index: 30;
background: #fff;
border: 1px solid #ccc;
padding: 10px;
@ -388,7 +246,7 @@ main {
bottom: 20px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
z-index: 30;
background: #fff;
border: 1px solid #ccc;
padding: 10px;
@ -445,7 +303,8 @@ main {
padding-bottom: 30px;
}
#about-us-text, #projects {
#about-us-text,
#projects {
padding-left: 20px;
padding-right: 20px;
}
@ -480,7 +339,7 @@ main {
#head-mentors ul,
#officers ul {
grid-template-columns: repeat(1, 1fr); /* 2 columns */
}
}
#mentors-1 ul,
#captains ul {

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>

View file

@ -1,41 +1,44 @@
<!DOCTYPE html>
<html lang="en"></html>
<head>
<link
rel="icon"
type="image/x-icon"
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<html lang="en">
<head>
<link
rel="icon"
type="image/x-icon"
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>
window.addEventListener("DOMContentLoaded", (event) => {
fetch("/Pages/navbar.html")
.then((response) => response.text())
.then((data) => {
document.getElementById("navbar").innerHTML = data;
});
fetch("/Pages/socials.html")
.then((response) => response.text())
.then((data) => {
document.getElementById("socials").innerHTML = data;
});
});
</script>
</head>
<body>
<!--Navigation Bar-->
<div id="navbar"></div>
<h1></h1>
<h1></h1>
<h1>Upload Photos and Videos</h1>
<form id="uploadForm" enctype="multipart/form-data">
<input type="file" name="file" id="fileInput" multiple />
<button type="submit">Upload</button>
</form>
<script>
window.addEventListener("DOMContentLoaded", (event) => {
fetch("/Pages/navbar.html")
.then((response) => response.text())
.then((data) => {
document.getElementById("navbar").innerHTML = data;
});
fetch("/Pages/socials.html")
.then((response) => response.text())
.then((data) => {
document.getElementById("socials").innerHTML = data;
});
});
</script>
</head>
<script src="/Pages/upload.js"></script>
<!-- Footer -->
<div id="socials"></div>
</body>
<body>
<!--Navigation Bar-->
<div id="navbar"></div>
<h1></h1>
<h1></h1>
<h1>Upload Photos and Videos</h1>
<form id="uploadForm" enctype="multipart/form-data">
<input type="file" name="file" id="fileInput" multiple />
<button type="submit">Upload</button>
</form>
<script src="/Pages/upload.js"></script>
<!-- Footer -->
<div id="socials"></div>
</body>
</html>

View file

@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<link
rel="icon"
@ -6,6 +7,7 @@
href="/Resources/Favicons/favicon.png"
/>
<link rel="stylesheet" href="/Pages/style.css" />
<script src="https://cdn.tailwindcss.com"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script>