Merge pull request #30 from EndofTimee/main

This commit is contained in:
Unknown 2025-01-08 07:12:46 -07:00 committed by GitHub
commit 57a616a4ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 88 additions and 82 deletions

View file

@ -4,7 +4,7 @@ name: Deploy Jekyll with GitHub Pages dependencies preinstalled
on: on:
# Runs on pushes targeting the default branch # Runs on pushes targeting the default branch
push: push:
branches: ["main"] branches: ["Pull-request-branch"]
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:

2
.gitignore vendored
View file

@ -1 +1,3 @@
Resources/facebook.png Resources/facebook.png
.github/workflows/jekyll-gh-pages.yml
CNAME

2
CNAME
View file

@ -1 +1 @@
https://teamparadise1165.com https://teamparadise1165.com/

View file

@ -26,21 +26,20 @@
</script> </script>
</head> </head>
<body> <body class="flex flex-col min-h-screen">
<!--Navigation Bar--> <!--Navigation Bar-->
<div id="navbar"></div> <header id="navbar" class="mb-16"></header>
<!-- Body --> <!-- Body -->
<div class="Title-Container"> <main class="flex-grow flex flex-col">
<h1 class="page-title" style="width: 100%; text-align: center"> <div class="flex justify-center items-center">
Donate <h1 class="text-3xl font-bold px-4">Donate</h1>
</h1> <img
<img src="/Resources/Icons/Pencil-icon.png"
src="/Resources/Icons/Pencil-icon.png" class="w-20"
id="TeamIcon" alt="Team Icon"
alt="Team Icon" />
/> </div>
</div>
<div class="UnderConstruction"> <div class="UnderConstruction">
This section is under construction... This section is under construction...

View file

@ -7,14 +7,14 @@
<ul <ul
class="flex flex-wrap justify-center items-center m-0 p-0 list-none" class="flex flex-wrap justify-center items-center m-0 p-0 list-none"
> >
<li> <!-- <li>
<img <img
src="/Resources/Black Logo-1.png" src="/Resources/Black Logo-1.png"
id="nav-logo" id="nav-logo"
alt="Team 1165 Logo" alt="Team 1165 Logo"
class="hidden md:inline w-[3.5vw] pr-[30%] align-middle" class="hidden md:inline w-[3.5vw] pr-[30%] align-middle"
/> />
</li> </li> -->
<li class="relative group"> <li class="relative group">
<a <a
href="/index.html" href="/index.html"
@ -22,20 +22,6 @@
> >
Home Home
</a> </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="/index.html"
class="block px-4 py-2 text-gray-900 hover:text-black"
>Leaders</a
>
</div>
</li> </li>
<li class="relative group"> <li class="relative group">
<a <a
@ -60,8 +46,8 @@
> >
Shop Shop
</a> </a>
</li> </li>
<li class="relative group"> <!-- <li class="relative group">
<a <a
href="/Pages/donate.html" 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" 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"
@ -73,17 +59,17 @@
> >
<a <a
href="/Pages/gen_donate.html" href="/Pages/gen_donate.html"
class="block px-4 py-2 text-gray-900 hover:text-black" class="block px-4 py-2 text-gray-900 text-xs md:text-sm lg:text-lg hover:text-black font-bold"
>General Donation</a >General Donation</a
> >
<a <a
href="/Pages/tax_credit_dono.html" href="/Pages/tax_credit_dono.html"
class="block px-4 py-2 text-gray-900 hover:text-black" class="block px-4 py-2 text-gray-900 text-xs md:text-sm lg:text-lg hover:text-black font-bold"
>Tax Credit</a >Tax Credit</a
> >
</div> </div>
</li> </li> -->
<li class="relative group"> <!-- <li class="relative group">
<a <a
href="/index.html" 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" 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"
@ -95,16 +81,16 @@
> >
<a <a
href="/Pages/projects.html" href="/Pages/projects.html"
class="block px-4 py-2 text-gray-900 hover:text-black" class="block px-4 py-2 text-gray-900 text-xs md:text-sm lg:text-lg hover:text-black font-bold"
>Projects</a >Projects</a
> >
<a <a
href="/Pages/awards.html" href="/Pages/awards.html"
class="block px-4 py-2 text-gray-900 hover:text-black" class="block px-4 py-2 text-gray-900 text-xs md:text-sm lg:text-lg hover:text-black font-bold"
>Awards</a >Awards</a
> >
</div> </div>
</li> </li> -->
</ul> </ul>
</nav> </nav>
</body> </body>

View file

@ -24,27 +24,46 @@
}); });
}); });
</script> </script>
<style>
#iframeContainer {
display: flex;
justify-content: center;
align-items: center;
height: 100vh; /* Full viewport height */
}
#zeffyIframe {
width: 80vw; /* 50% of the viewport width */
height: 90vh; /* 50% of the viewport height */
}
</style>
</head> </head>
<body> <body class="flex flex-col min-h-screen">
<!--Navigation Bar--> <!--Navigation Bar-->
<div id="navbar"></div> <header id="navbar" class="mb-16"></header>
<!-- Body --> <!-- Body -->
<div class="Title-Container"> <main class="flex-grow flex flex-col">
<h1 class="page-title" style="width: 100%; text-align: center"> <div class="flex justify-center items-center">
Shop <h1 class="text-3xl font-bold px-4">Shop</h1>
</h1> <img
<img src="/Resources/Icons/team-icon.png"
src="/Resources/Icons/team-icon.png" class="w-20"
id="TeamIcon" alt="Team Icon"
alt="Team Icon" />
/> </div>
</div> <div class="flex-grow relative overflow-auto" id="iframeContainer">
<iframe
<div class="UnderConstruction"> id="zeffyIframe"
This section is under construction... class="w-full p-4"
</div> src="https://www.zeffy.com/embed/ticketing/78ec0d8d-12a7-4f4a-9b97-7c9beea43fd5"
style="border: 0; overflow: hidden"
frameborder="0"
allowpaymentrequest
allowTransparency="true"
></iframe>
</div>
</main>
<!-- Footer --> <!-- Footer -->
<div id="socials"></div> <div id="socials"></div>

View file

@ -54,7 +54,7 @@ main {
.logo-container #Logo-Image { .logo-container #Logo-Image {
position: fixed; position: fixed;
z-index: 0; z-index: 1;
width: auto; width: auto;
height: auto; height: auto;
max-width: calc(60vw); max-width: calc(60vw);
@ -230,7 +230,7 @@ main {
} }
.instagram { .instagram {
background-color: #e4405f; background-color: #222332;
} }
.facebook { .facebook {
@ -266,7 +266,15 @@ main {
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
} }
#shopIframe {
width: 100%;
border: none;
}
#iframeContainer {
height: 100%;
overflow: auto;
}
/*Mobile*/ /*Mobile*/
@media screen and (max-width: 1000px) { @media screen and (max-width: 1000px) {
/* comes into effect for screens larger than or equal to 481 pixels */ /* comes into effect for screens larger than or equal to 481 pixels */

View file

@ -111,13 +111,13 @@
<section id="head-mentors"> <section id="head-mentors">
<ul class="leaders-list"> <ul class="leaders-list">
<li id="lead-coach-1"> <li id="lead-coach-1">
<div>Jorge "Chef" Ramos</div> <div>Melanie Young</div>
<span> Head Coach </span> <span> Head Coach </span>
</li> </li>
<li id="lead-coach-2"> <!-- <li id="lead-coach-2">
<div>Alex Ruiz</div> <div>Alex Ruiz</div>
<span> Coach </span> <span> Coach </span>
</li> </li> -->
</ul> </ul>
</section> </section>
@ -136,14 +136,6 @@
<div>Gatlin Farrington</div> <div>Gatlin Farrington</div>
<span> Electrical & Programming </span> <span> Electrical & Programming </span>
</li> </li>
<li>
<div>Alarmel S</div>
<span> Build & Design </span>
</li>
<li>
<div>Sam R</div>
<span> Administration </span>
</li>
<li> <li>
<div>Ken Whitley</div> <div>Ken Whitley</div>
<span> Build </span> <span> Build </span>
@ -171,19 +163,19 @@
<section id="officers"> <section id="officers">
<ul class="leaders-list"> <ul class="leaders-list">
<li> <li>
<div>Aneesa Napoli</div> <div>Aneesa</div>
<span> President </span> <span> President </span>
</li> </li>
<li> <li>
<div>Abby Neil</div> <div>Abby</div>
<span> Vice President </span> <span> Vice President </span>
</li> </li>
<li> <li>
<div>Mason Cucci</div> <div>Lily</div>
<span> Treasurer </span> <span> Treasurer </span>
</li> </li>
<li> <li>
<div>Lucius Tso</div> <div>Lucius</div>
<span> Secretary </span> <span> Secretary </span>
</li> </li>
</ul> </ul>
@ -193,43 +185,43 @@
<section id="captains"> <section id="captains">
<ul class="leaders-list"> <ul class="leaders-list">
<li> <li>
<div>Alexander Podborny</div> <div>Alexander</div>
<span> Captain of Build </span> <span> Captain of Build </span>
</li> </li>
<li> <li>
<div>Michael Yagodnik</div> <div>Michael</div>
<span> Captain of Design </span> <span> Captain of Design </span>
</li> </li>
<li> <li>
<div>Andrew McBeath</div> <div>Andrew</div>
<span> Captain of CAD </span> <span> Captain of CAD </span>
</li> </li>
<li> <li>
<div>Anthony Harkins</div> <div>Anthony</div>
<span> Captain of Electrical </span> <span> Captain of Electrical </span>
</li> </li>
<li> <li>
<div>Bridget Ruble</div> <div>Bridget</div>
<span> Captain of Media </span> <span> Captain of Media </span>
</li> </li>
<li> <li>
<div>Ashton Antila</div> <div>Ashton</div>
<span> Captain of Programming </span> <span> Captain of Programming </span>
</li> </li>
<li> <li>
<div>Mason Cucci</div> <div>Lily</div>
<span> Captain of Safety </span> <span> Captain of Safety </span>
</li> </li>
<li> <li>
<div>Kaylynn Decker</div> <div>Kaylynn</div>
<span> Captain of Organization </span> <span> Captain of Organization </span>
</li> </li>
<li> <li>
<div>Nic Fejfar</div> <div>Nic</div>
<span> Captain of Scouting </span> <span> Captain of Scouting </span>
</li> </li>
<li> <li>
<div>Aneesa Napoli</div> <div>Aneesa</div>
<span> Captain of The Arts </span> <span> Captain of The Arts </span>
</li> </li>
</ul> </ul>