Skip to content

Commit b557244

Browse files
DiscusserDiscusser
committed
Uniwidth font
1 parent 4034433 commit b557244

File tree

18 files changed

+157
-49
lines changed

18 files changed

+157
-49
lines changed

‎src/app.css‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,49 @@
7272
* {
7373
@apply border-border;
7474
}
75+
76+
html {
77+
font-family:
78+
system-ui,
79+
-apple-system,
80+
BlinkMacSystemFont,
81+
'Segoe UI',
82+
Roboto,
83+
Oxygen,
84+
Ubuntu,
85+
Cantarell,
86+
'Open Sans',
87+
'Helvetica Neue',
88+
sans-serif;
89+
}
90+
7591
body {
7692
@apply bg-background text-foreground;
7793
}
94+
95+
@font-face {
96+
font-family: 'PTRootUIWebVF';
97+
font-style: normal;
98+
font-weight: normal;
99+
src: url(pt-root-ui_vf.woff2) format('woff2');
100+
}
101+
102+
@font-face {
103+
font-family: 'PTRootUIWebBold';
104+
font-style: normal;
105+
font-weight: bold;
106+
src: url(pt-root-ui_bold.woff2) format('woff2');
107+
}
78108
}
79109

80110
a {
81-
@apply text-blue-500 hover:underline;
111+
@apply text-muted-foreground hover:underline;
82112
}
83113

84114
p {
85115
@apply text-muted-foreground;
86116
}
117+
118+
ul {
119+
@apply pl-4;
120+
}

‎src/lib/components/contact/ContactMe.svelte‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="space-y-2">
2+
<p class="text-2xl font-bold text-foreground">Contact</p>
3+
<p>
4+
You can contact me via <a class="text-blue-500" href="mailto:discussercodes@gmail.com">mail</a>,
5+
or on Discord (my username is Discusser).
6+
</p>
7+
</div>

‎src/lib/components/home/AboutMe.svelte‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<script lang="ts">
22
</script>
33

4-
<div class="space-y-2 p-6">
4+
<div class="space-y-2">
55
<p class="text-2xl font-bold text-foreground">About me</p>
66
<p>
77
I'm a person who enjoys programming, maths, and physics. I also like playing the piano, working
88
out, and reading (mainly philosophy books). What I enjoy the most with programming is the fact
99
that I can build whatever I want given enough time. At the moment, I'm still in high school, and
1010
I plan on studying something related to computer science later on. Some of my projects are
11-
available on the <a href="/projects" class="text-blue-500 hover:underline">Projects</a>
11+
available on the <a href="/projects" class="text-blue-500">Projects</a>
1212
page, and most of them are on my
13-
<a href="https://github.com/Discusser" target="_blank" class="text-blue-500 hover:underline"
14-
>GitHub</a
15-
>
13+
<a href="https://github.com/Discusser" target="_blank" class="text-blue-500">GitHub</a>
1614
page
1715
</p>
1816
</div>

‎src/lib/components/shared/NavAnchor.svelte‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<script lang="ts">
2+
import { page } from '$app/stores';
3+
import type { Snippet } from 'svelte';
4+
import { twMerge } from 'tailwind-merge';
5+
6+
let {
7+
href,
8+
target,
9+
children,
10+
class: className,
11+
...others
12+
}: {
13+
children: Snippet;
14+
href: string;
15+
target?: string;
16+
class?: string;
17+
} = $props();
18+
</script>
19+
20+
<a
21+
{href}
22+
{target}
23+
class={twMerge(
24+
'text-lg',
25+
$page.url.pathname == href ? 'font-displayBold' : 'font-display',
26+
className
27+
)}
28+
{...others}
29+
>
30+
{@render children()}
31+
</a>

‎src/lib/components/shared/NavBar.svelte‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<script lang="ts">
2+
import NavAnchor from '$lib/components/shared/NavAnchor.svelte';
23
</script>
34

4-
<div class="flex justify-center space-x-8 p-4 *:text-foreground">
5-
<a href="/">Home</a>
6-
<a href="/projects">Projects</a>
7-
<a href="/blog">Blog</a>
8-
<a href="/contact">Contact</a>
5+
<div class="flex justify-center space-x-8 p-4 *:text-muted-foreground">
6+
<NavAnchor href="/">Home</NavAnchor>
7+
<NavAnchor href="/projects">Projects</NavAnchor>
8+
<NavAnchor href="/blog">Blog</NavAnchor>
9+
<NavAnchor href="/contact">Contact</NavAnchor>
910
</div>
1011
<hr />

‎src/lib/components/shared/SideNav.svelte‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<script lang="ts">
2+
import NavAnchor from '$lib/components/shared/NavAnchor.svelte';
3+
</script>
4+
5+
<div>
6+
<ul>
7+
<li><NavAnchor href="/">Home</NavAnchor></li>
8+
<li>
9+
<NavAnchor href="/projects">Projects</NavAnchor>
10+
<ul>
11+
<li><NavAnchor href="/projects/web">Web</NavAnchor></li>
12+
<li><NavAnchor href="/projects/cpp">C/C++</NavAnchor></li>
13+
<li><NavAnchor href="/projects/python">Python</NavAnchor></li>
14+
</ul>
15+
</li>
16+
<li><NavAnchor href="/blog">Blog</NavAnchor></li>
17+
<li><NavAnchor href="/contact">Contact</NavAnchor></li>
18+
</ul>
19+
</div>

‎src/routes/+error.svelte‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="flex flex-col items-center p-6">
2-
<p class="mb-2 text-4xl">404 Error</p>
3-
<p class="text-muted-foreground">This page does not exist.</p>
4-
<p class="text-muted-foreground">Would you like to go <a href="/">home</a>?</p>
1+
<div class="flex flex-col items-center">
2+
<p class="mb-2 text-4xl text-foreground">404 Error</p>
3+
<p>This page does not exist.</p>
4+
<p>Would you like to go <a href="/">home</a>?</p>
55
</div>

‎src/routes/+layout.svelte‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@
44
import { Toaster } from '$lib/components/ui/sonner';
55
import NavBar from '$lib/components/shared/NavBar.svelte';
66
import Footer from '$lib/components/shared/Footer.svelte';
7+
import SideNav from '$lib/components/shared/SideNav.svelte';
78
</script>
89

910
<div class="flex h-screen flex-col">
1011
<ModeWatcher />
1112
<Toaster />
1213
<NavBar />
1314

14-
<div class="w-1/2 flex-grow self-center">
15-
<slot />
15+
<div class="flex flex-grow items-start space-x-4 p-4">
16+
<div class="w-1/4">
17+
<SideNav />
18+
</div>
19+
<div class="w-1/2">
20+
<slot />
21+
</div>
1622
</div>
1723

1824
<Footer />

‎src/routes/blog/+page.svelte‎

Whitespace-only changes.

‎src/routes/contact/+page.svelte‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<script lang="ts">
2+
import ContactMe from '$lib/components/contact/ContactMe.svelte';
3+
</script>
4+
5+
<div class="flex flex-col">
6+
<ContactMe />
7+
</div>

0 commit comments

Comments
 (0)