Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use brand fonts #13

Merged
merged 2 commits into from
Nov 21, 2024
+179 −18
Merged

Use brand fonts #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1cba63
feat: init brand fonts
awwpotato Nov 21, 2024
d572d44
fix: use correct header font
awwpotato Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 143 additions & 0 deletions src/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer utilities {
/* Hide scrollbar for Chrome, Safari and Opera */
.no-scrollbar::-webkit-scrollbar {
Expand All @@ -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');
}
}
2 changes: 1 addition & 1 deletion src/lib/components/SuccessFail.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div class="fixed inset-0 flex items-center justify-center bg-eerie_black">
<div
class="grid h-dvh max-h-[48rem] w-dvw max-w-96 grid-cols-2 grid-rows-4 gap-4 p-4 text-xl font-extrabold text-white"
class="grid h-dvh max-h-[48rem] w-dvw max-w-96 grid-cols-2 grid-rows-4 gap-4 p-4 font-heading text-xl font-extrabold text-white"
>
<button
class="row-span-3 rounded-lg bg-jungle_green shadow-lg shadow-jungle_green/50"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/Timeline.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
{/if}
{/each}
{#if actions.length === 0}
<h3 class="m-auto">No actions yet :3</h3>
<h3 class="m-auto font-heading font-bold">No actions yet :3</h3>
{/if}
</div>
</button>
2 changes: 1 addition & 1 deletion src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

<style lang="postcss">
:global(body) {
@apply bg-eerie_black text-white;
@apply bg-eerie_black font-sans text-white;
}
</style>
4 changes: 2 additions & 2 deletions src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex h-dvh flex-col items-center justify-evenly">
<h1 class="text-center text-5xl font-bold">hiiii :3</h1>
<h1 class="text-center font-heading text-5xl font-bold">hiiii :3</h1>
<a
class="rounded bg-gunmetal px-4 py-2 text-center text-2xl font-bold text-yolk_yellow"
class="rounded bg-gunmetal px-4 py-2 text-center font-heading text-2xl font-bold text-yolk_yellow"
href="/queue"
>
scout
Expand Down
2 changes: 1 addition & 1 deletion src/routes/queue/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div
class="grid h-full w-full grid-cols-1 grid-rows-2 place-items-center gap-4 align-middle text-4xl text-white"
>
<h1 class="p-2">In Queue</h1>
<h1 class="p-2 font-heading font-bold">In Queue</h1>

<button class="rounded border p-4" onclick={leave}>Leave Queue</button>
</div>
8 changes: 4 additions & 4 deletions src/routes/scout/[team_data]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@

<div class="m-auto flex h-dvh max-w-md flex-col items-center gap-2 p-2">
<div class="flex w-full justify-between border-b-2 border-white/10 pb-2 font-semibold">
<span class="flex-shrink-0">Team {data.team_key}</span>
<h2 class="flex-shrink-0 font-heading font-semibold">Team {data.team_key}</h2>
<div class="flex gap-2">
<button
onclick={phaseShiftLeft}
class={gamePhase === 'Auto' ? 'pointer-events-none opacity-30' : ''}
><ArrowLeft /></button
>
<span class="text-right">{gamePhase}: {pageName}</span>
<h2 class="text-right font-heading font-semibold">{gamePhase}: {pageName}</h2>
<button
onclick={phaseShiftRight}
class={gamePhase === 'Post' ? 'pointer-events-none opacity-30' : ''}
Expand All @@ -75,7 +75,7 @@
{#if gamePhase === 'Auto'}
<AutoActionInputs bind:furthest_auto_index bind:held bind:actions bind:pageName />
<button
class="w-full border-t-2 border-white/10 pt-2 text-center font-semibold"
class="w-full border-t-2 border-white/10 pt-2 text-center font-heading font-semibold"
onclick={(e: Event) => {
e.stopPropagation();
timelineExtended = true;
Expand All @@ -90,7 +90,7 @@
{:else if gamePhase === 'Tele'}
<TeleActionInputs bind:held bind:actions bind:pageName />
<button
class="w-full border-t-2 border-white/10 pt-2 text-center font-semibold"
class="w-full border-t-2 border-white/10 pt-2 text-center font-heading font-semibold"
onclick={(e: Event) => {
e.stopPropagation();
timelineExtended = true;
Expand Down
14 changes: 10 additions & 4 deletions src/routes/scout/[team_data]/AutoActionInputs.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@

<div class="align-center flex w-full max-w-md flex-grow flex-col px-2">
{#if is_none_state}
<div class="grid flex-grow grid-cols-1 grid-rows-3 gap-2 py-2 text-2xl font-bold">
<div
class="grid flex-grow grid-cols-1 grid-rows-3 gap-2 py-2 font-heading text-2xl font-bold"
>
<button class="rounded bg-gunmetal p-2" onclick={intake_piece}>Intake</button>
{#if held_scorables > 0}
<button class="rounded bg-gunmetal p-2" onclick={score_piece}>Score</button>
Expand All @@ -81,7 +83,9 @@
{/if}
</div>
{:else if is_intake_state}
<div class="grid w-full flex-grow grid-cols-2 grid-rows-2 gap-2 py-2 text-xl font-bold">
<div
class="grid w-full flex-grow grid-cols-2 grid-rows-2 gap-2 py-2 font-heading text-xl font-bold"
>
<button class="rounded bg-gunmetal p-2" onclick={() => (actionState = 'IntakeBunny')}
>Bunny</button
>
Expand All @@ -101,7 +105,9 @@
onclick={() => (actionState = 'None')}>Cancel</button
>
{:else if is_score_state}
<div class="flex w-full flex-grow flex-col items-center gap-2 py-2 text-lg font-bold">
<div
class="flex w-full flex-grow flex-col items-center gap-2 py-2 font-heading text-lg font-bold"
>
{#if held.bunnies > 0}
<div class="flex w-full flex-grow flex-col items-center gap-2 text-lg">
<h1>Bunny</h1>
Expand Down Expand Up @@ -160,7 +166,7 @@
>
</div>
{:else if is_eject_state}
<div class="grid w-full flex-grow grid-flow-row gap-2 py-2 font-bold">
<div class="grid w-full flex-grow grid-flow-row gap-2 py-2 font-heading font-bold">
{#if held.bunnies > 0}
<button
class="w-full rounded bg-gunmetal p-2"
Expand Down
14 changes: 10 additions & 4 deletions src/routes/scout/[team_data]/TeleActionInputs.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@

<div class="align-center flex w-full max-w-md flex-grow flex-col px-2">
{#if is_none_state}
<div class="grid flex-grow grid-cols-1 grid-rows-3 gap-2 py-2 text-2xl font-bold">
<div
class="grid flex-grow grid-cols-1 grid-rows-3 gap-2 py-2 font-heading text-2xl font-bold"
>
<button class="rounded bg-gunmetal p-2" onclick={intake_piece}>Intake</button>
{#if held.balloons > 0}
<button class="rounded bg-gunmetal p-2" onclick={score_piece}>Score</button>
Expand All @@ -74,7 +76,9 @@
{/if}
</div>
{:else if is_intake_state}
<div class="grid w-full flex-grow grid-cols-2 grid-rows-2 gap-2 py-2 text-xl font-bold">
<div
class="grid w-full flex-grow grid-cols-2 grid-rows-2 gap-2 py-2 font-heading text-xl font-bold"
>
<button
class="col-span-2 rounded bg-gunmetal p-2"
onclick={() => (actionState = 'IntakeTote')}>Tote</button
Expand All @@ -92,7 +96,9 @@
onclick={() => (actionState = 'None')}>Cancel</button
>
{:else if is_score_state}
<div class="flex w-full flex-grow flex-col items-center gap-2 py-2 text-lg font-bold">
<div
class="flex w-full flex-grow flex-col items-center gap-2 py-2 font-heading text-lg font-bold"
>
<div class="flex w-full flex-grow flex-col items-center gap-2 py-2 text-lg">
<h1>Ballon</h1>
<div class="grid w-full flex-grow grid-cols-2 grid-rows-2 gap-2">
Expand Down Expand Up @@ -121,7 +127,7 @@
>
</div>
{:else if is_eject_state}
<div class="grid w-full flex-grow grid-flow-row gap-2 py-2 font-bold">
<div class="grid w-full flex-grow grid-flow-row gap-2 py-2 font-heading font-bold">
{#if held.balloons > 0}
<button
class="w-full rounded bg-gunmetal p-2"
Expand Down
Binary file added static/fonts/poppins/Poppins-Black.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-BlackItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-BoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-ExtraBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-ExtraBoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-ExtraLight.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-ExtraLightItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-Italic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-LightItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-MediumItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-SemiBoldItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-Thin.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/poppins/Poppins-ThinItalic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/teko/Teko-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/teko/Teko-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/teko/Teko-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/teko/Teko-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added static/fonts/teko/Teko-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
const defaultTheme = require('tailwindcss/defaultTheme');

/** @type {import('tailwindcss').Config} */
export default {
content: ['./src/**/*.{html,js,svelte,ts}'],
theme: {
extend: {
fontFamily: {
sans: ['Poppins', ...defaultTheme.fontFamily.sans],
heading: ['Teko', ...defaultTheme.fontFamily.sans]
},
colors: {
white: '#ffffff',
eerie_black: '#1C1C1C',
Expand Down
Loading