From 39736e190df1f9a286e3ded4cd4100235cf8f882 Mon Sep 17 00:00:00 2001 From: awwpotato <153149335+awwpotato@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:09:49 -1000 Subject: [PATCH] Use brand fonts (#13) * feat: init brand fonts * fix: use correct header font --- src/app.css | 143 ++++++++++++++++++ src/lib/components/SuccessFail.svelte | 2 +- src/lib/components/Timeline.svelte | 2 +- src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 4 +- src/routes/queue/+page.svelte | 2 +- src/routes/scout/[team_data]/+page.svelte | 8 +- .../scout/[team_data]/AutoActionInputs.svelte | 14 +- .../scout/[team_data]/TeleActionInputs.svelte | 14 +- static/fonts/poppins/Poppins-Black.ttf | Bin 0 -> 151396 bytes static/fonts/poppins/Poppins-BlackItalic.ttf | Bin 0 -> 171604 bytes static/fonts/poppins/Poppins-Bold.ttf | Bin 0 -> 153944 bytes static/fonts/poppins/Poppins-BoldItalic.ttf | Bin 0 -> 176588 bytes static/fonts/poppins/Poppins-ExtraBold.ttf | Bin 0 -> 152764 bytes .../fonts/poppins/Poppins-ExtraBoldItalic.ttf | Bin 0 -> 173916 bytes static/fonts/poppins/Poppins-ExtraLight.ttf | Bin 0 -> 161456 bytes .../poppins/Poppins-ExtraLightItalic.ttf | Bin 0 -> 186168 bytes static/fonts/poppins/Poppins-Italic.ttf | Bin 0 -> 182012 bytes static/fonts/poppins/Poppins-Light.ttf | Bin 0 -> 159892 bytes static/fonts/poppins/Poppins-LightItalic.ttf | Bin 0 -> 184460 bytes static/fonts/poppins/Poppins-Medium.ttf | Bin 0 -> 156520 bytes static/fonts/poppins/Poppins-MediumItalic.ttf | Bin 0 -> 180444 bytes static/fonts/poppins/Poppins-Regular.ttf | Bin 0 -> 158240 bytes static/fonts/poppins/Poppins-SemiBold.ttf | Bin 0 -> 155232 bytes .../fonts/poppins/Poppins-SemiBoldItalic.ttf | Bin 0 -> 178584 bytes static/fonts/poppins/Poppins-Thin.ttf | Bin 0 -> 161652 bytes static/fonts/poppins/Poppins-ThinItalic.ttf | Bin 0 -> 187044 bytes static/fonts/teko/Teko-Bold.ttf | Bin 0 -> 154868 bytes static/fonts/teko/Teko-Light.ttf | Bin 0 -> 154056 bytes static/fonts/teko/Teko-Medium.ttf | Bin 0 -> 154672 bytes static/fonts/teko/Teko-Regular.ttf | Bin 0 -> 154704 bytes static/fonts/teko/Teko-SemiBold.ttf | Bin 0 -> 154876 bytes tailwind.config.js | 6 + 33 files changed, 179 insertions(+), 18 deletions(-) create mode 100644 static/fonts/poppins/Poppins-Black.ttf create mode 100644 static/fonts/poppins/Poppins-BlackItalic.ttf create mode 100644 static/fonts/poppins/Poppins-Bold.ttf create mode 100644 static/fonts/poppins/Poppins-BoldItalic.ttf create mode 100644 static/fonts/poppins/Poppins-ExtraBold.ttf create mode 100644 static/fonts/poppins/Poppins-ExtraBoldItalic.ttf create mode 100644 static/fonts/poppins/Poppins-ExtraLight.ttf create mode 100644 static/fonts/poppins/Poppins-ExtraLightItalic.ttf create mode 100644 static/fonts/poppins/Poppins-Italic.ttf create mode 100644 static/fonts/poppins/Poppins-Light.ttf create mode 100644 static/fonts/poppins/Poppins-LightItalic.ttf create mode 100644 static/fonts/poppins/Poppins-Medium.ttf create mode 100644 static/fonts/poppins/Poppins-MediumItalic.ttf create mode 100644 static/fonts/poppins/Poppins-Regular.ttf create mode 100644 static/fonts/poppins/Poppins-SemiBold.ttf create mode 100644 static/fonts/poppins/Poppins-SemiBoldItalic.ttf create mode 100644 static/fonts/poppins/Poppins-Thin.ttf create mode 100644 static/fonts/poppins/Poppins-ThinItalic.ttf create mode 100644 static/fonts/teko/Teko-Bold.ttf create mode 100644 static/fonts/teko/Teko-Light.ttf create mode 100644 static/fonts/teko/Teko-Medium.ttf create mode 100644 static/fonts/teko/Teko-Regular.ttf create mode 100644 static/fonts/teko/Teko-SemiBold.ttf diff --git a/src/app.css b/src/app.css index 33f90fa..88cbea2 100644 --- a/src/app.css +++ b/src/app.css @@ -1,6 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; + @layer utilities { /* Hide scrollbar for Chrome, Safari and Opera */ .no-scrollbar::-webkit-scrollbar { @@ -12,3 +13,145 @@ scrollbar-width: none; /* Firefox */ } } + +@layer base { + @font-face { + font-family: Teko; + font-style: normal; + font-weight: 300; + src: url(/static/fonts/teko/Teko-Light.ttf) format('tff'); + } + @font-face { + font-family: Teko; + font-style: normal; + font-weight: 400; + src: url(/static/fonts/teko/Teko-Regular.ttf) format('tff'); + } + @font-face { + font-family: Teko; + font-style: normal; + font-weight: 500; + src: url(/static/fonts/teko/Teko-Medium.ttf) format('tff'); + } + @font-face { + font-family: Teko; + font-style: normal; + font-weight: 600; + src: url(/static/fonts/teko/Teko-SemiBold.ttf) format('tff'); + } + @font-face { + font-family: Teko; + font-style: normal; + font-weight: 700; + src: url(/static/fonts/teko/Teko-Bold.ttf) format('tff'); + } + + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 100; + src: url(/static/fonts/poppins/Poppins-Thin.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 100; + src: url(/static/fonts/poppins/Poppins-ThinItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 200; + src: url(/static/fonts/poppins/Poppins-ExtraLight.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 200; + src: url(/static/fonts/poppins/Poppins-ExtraLightItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 300; + src: url(/static/fonts/poppins/Poppins-Light.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 300; + src: url(/static/fonts/poppins/Poppins-LightItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 400; + src: url(/static/fonts/poppins/Poppins-Regular.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 400; + src: url(/static/fonts/poppins/Poppins-Italic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 500; + src: url(/static/fonts/poppins/Poppins-Medium.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 500; + src: url(/static/fonts/poppins/Poppins-MediumItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 600; + src: url(/static/fonts/poppins/Poppins-SemiBold.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 600; + src: url(/static/fonts/poppins/Poppins-SemiBoldItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 700; + src: url(/static/fonts/poppins/Poppins-Bold.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 700; + src: url(/static/fonts/poppins/Poppins-BoldItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 800; + src: url(/static/fonts/poppins/Poppins-ExtraBold.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 800; + src: url(/static/fonts/poppins/Poppins-ExtraBoldItalic.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: normal; + font-weight: 900; + src: url(/static/fonts/poppins/Poppins-Black.ttf) format('tff'); + } + @font-face { + font-family: Poppins; + font-style: italic; + font-weight: 900; + src: url(/static/fonts/poppins/Poppins-BlackItalic.ttf) format('tff'); + } +} diff --git a/src/lib/components/SuccessFail.svelte b/src/lib/components/SuccessFail.svelte index a2ffa60..a964b93 100644 --- a/src/lib/components/SuccessFail.svelte +++ b/src/lib/components/SuccessFail.svelte @@ -5,7 +5,7 @@
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 493a0b6..71df272 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -7,6 +7,6 @@ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6560c58..2a22995 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,7 +1,7 @@
-

hiiii :3

+

hiiii :3

scout diff --git a/src/routes/queue/+page.svelte b/src/routes/queue/+page.svelte index 5de3f53..70bf9ec 100644 --- a/src/routes/queue/+page.svelte +++ b/src/routes/queue/+page.svelte @@ -21,7 +21,7 @@
-

In Queue

+

In Queue

diff --git a/src/routes/scout/[team_data]/+page.svelte b/src/routes/scout/[team_data]/+page.svelte index c62396a..404c38d 100644 --- a/src/routes/scout/[team_data]/+page.svelte +++ b/src/routes/scout/[team_data]/+page.svelte @@ -56,14 +56,14 @@
- Team {data.team_key} +

Team {data.team_key}

- {gamePhase}: {pageName} +

{gamePhase}: {pageName}

{#if held_scorables > 0} @@ -81,7 +83,9 @@ {/if}
{:else if is_intake_state} -
+
@@ -101,7 +105,9 @@ onclick={() => (actionState = 'None')}>Cancel {:else if is_score_state} -
+
{#if held.bunnies > 0}

Bunny

@@ -160,7 +166,7 @@ >
{:else if is_eject_state} -
+
{#if held.bunnies > 0} {#if held.balloons > 0} @@ -74,7 +76,9 @@ {/if}
{:else if is_intake_state} -
+
(actionState = 'None')}>Cancel {:else if is_score_state} -
+

Ballon

@@ -121,7 +127,7 @@ >
{:else if is_eject_state} -
+
{#if held.balloons > 0}