Skip to content

Commit

Permalink
Merge pull request #281 from worldaffairsconference/dev
Browse files Browse the repository at this point in the history
add build, bug fixes, text changes
  • Loading branch information
ZeendaBean24 authored Nov 12, 2024
2 parents 13e2042 + 7adcf0d commit 5f3659f
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 107 deletions.
76 changes: 0 additions & 76 deletions src/lib/components/AnnouncementBanner.svelte

This file was deleted.

44 changes: 26 additions & 18 deletions src/routes/(other)/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Components
import Tooltip from "$lib/components/Tooltip.svelte";
import ScrollAnimations from "./ScrollAnimations.svelte";
import AnnouncementBanner from "$lib/components/AnnouncementBanner.svelte";
// import AnnouncementBanner from "$lib/components/AnnouncementBanner.svelte";
const user = $page.data.session?.user as User | undefined;
Expand Down Expand Up @@ -43,28 +43,15 @@
const timeUntilConference = calculateDaysUntilDate(new Date(2025, 3, 5)); // Change when the date is confirmed
</script>
<style>
.glow {
text-shadow: 0 0 10px rgba(255, 255, 255, 0.8),
0 0 20px rgba(255, 255, 255, 0.6),
0 0 30px rgba(255, 255, 255, 0.4);
transition: text-shadow 0.3s ease-in-out;
}

.glow:hover {
text-shadow: 0 0 15px rgba(255, 255, 255, 1),
0 0 25px rgba(255, 255, 255, 0.8),
0 0 35px rgba(255, 255, 255, 0.6);
}
</style>
<section
class="pt-[4rem] md:pt-[6rem] text-center flex flex-col items-center h-screen w-screen absolute inset-0 z-20"
>
<h2
class="text-[1.4rem] sm:text-[1.6rem] lg:text-[1.9rem] uppercase mb-2.5 lg:mb-3.5 text-transparent bg-clip-text bg-gradient-to-r from-primary to-secondary px-3"
>
<span>Theme</span>
<span class="italic">TBD</span>
<span class="italic">WAC To The Future</span>
</h2>
<div class="w-5/6 mx-auto">
<h1
Expand Down Expand Up @@ -108,18 +95,22 @@
</a>
{/if}
<div id="statsSection" class="w-full text-center">
<h2 class="text-transparent text-2xl sm:text-4xl font-bold mb-4 bg-clip-text bg-gradient-to-br from-white to-secondary">WAC has reached</h2>
<h2
class="text-transparent text-2xl sm:text-4xl font-bold mb-4 bg-clip-text bg-gradient-to-br from-white to-secondary"
>
WAC has reached
</h2>
<span class="text-white text-lg md:text-2xl glow">10k+ students</span>
<span class="text-secondary mx-2">・</span>
<span class="text-white text-lg md:text-2xl glow">80+ schools</span>
<span class="text-secondary mx-2">・</span>
<span class="text-white text-lg md:text-2xl glow">35+ countries</span>

</div>
</section>

<ScrollAnimations />

<AnnouncementBanner />
<!-- <AnnouncementBanner /> -->

<!--
<section
Expand Down Expand Up @@ -182,3 +173,20 @@
</form>
</div>
</section> -->

<style>
.glow {
text-shadow:
0 0 10px rgba(255, 255, 255, 0.8),
0 0 20px rgba(255, 255, 255, 0.6),
0 0 30px rgba(255, 255, 255, 0.4);
transition: text-shadow 0.3s ease-in-out;
}
.glow:hover {
text-shadow:
0 0 15px rgba(255, 255, 255, 1),
0 0 25px rgba(255, 255, 255, 0.8),
0 0 35px rgba(255, 255, 255, 0.6);
}
</style>
19 changes: 9 additions & 10 deletions src/routes/(other)/Footer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import branksomeLogo from "$lib/assets/images/logos/branksome.webp";
import uccLogo from "$lib/assets/images/logos/ucc.webp";
import famersEdgeLogo from "$lib/assets/images/logos/farmers-edge.webp";
interface Social {
name: string;
Expand Down Expand Up @@ -45,12 +44,12 @@
}
];
const supporters: Credit[] = [
{
name: "Farmers Edge",
logo: famersEdgeLogo
}
];
// const supporters: Credit[] = [
// {
// name: "Farmers Edge",
// logo: famersEdgeLogo
// }
// ];
</script>

<footer class="bg-zinc-950">
Expand All @@ -77,10 +76,10 @@
</div>

<!-- Vertical divider -->
<div class="w-0.5 bg-zinc-600 my-6 md:my-3"></div>
<!-- <div class="w-0.5 bg-zinc-600 my-6 md:my-3"></div> -->

<div class="grow">
<div
<!-- <div
class="text-zinc-400 mb-3 text-[0.7rem] lg:text-[0.8rem] uppercase"
>
Supporters
Expand All @@ -95,7 +94,7 @@
class="h-[2rem] lg:h-[2.25rem]"
/>
{/each}
</div>
</div> -->
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/routes/(other)/ScrollAnimations.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,9 @@
});
async function loadVideoSection() {
videoSection = await import("./Video.svelte");
videoSection = await import("./Video.svelte");
}
const handleWindowResize = () => {
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(other)/team/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
position: string;
image: string;
}
const chairs: TeamMember[] = [
{
name: "Darwin Li",
Expand Down

0 comments on commit 5f3659f

Please sign in to comment.