Skip to content

Commit 6fd0c89

Browse files
committed
add: the theme toggle button transitions again and a buncha bs idk lol
1 parent f89d1c6 commit 6fd0c89

4 files changed

Lines changed: 22 additions & 18 deletions

File tree

src/App.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<script lang="ts">
2-
import ThemeToggle from "./lib/components/ThemeToggle.svelte";
32
import MainBird from "./lib/components/MainBird.svelte";
43
import Clock from "./lib/components/Clock.svelte";
54
</script>
65

7-
<ThemeToggle />
86
<header class="fixed flex flex-row bg-transparent"></header>
97
<main class="flex flex-col justify-center items-center">
108
<Clock />

src/app.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
.roll-in, .roll-out {
1515
animation-duration: 250ms;
16-
animation-timing-function: ease-in-out;
16+
animation-timing-function: ease-out;
1717
animation-fill-mode: forwards;
1818
}
1919

@@ -27,7 +27,7 @@
2727

2828
@keyframes roll-in {
2929
from {
30-
transform: translateX(-80px) rotate(-0.25turn);
30+
transform: translateX(-40px) rotate(-0.25turn);
3131
}
3232
to {
3333
transform: translateX(0) rotate(0turn);
@@ -39,7 +39,7 @@
3939
transform: translateX(0) rotate(0turn);
4040
}
4141
to {
42-
transform: translateX(-80px) rotate(-0.25turn);
42+
transform: translateX(-40px) rotate(-0.25turn);
4343
}
4444
}
4545

src/lib/components/Clock.svelte

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script lang="ts">
22
import { onDestroy, onMount } from "svelte";
3+
import ThemeToggle from "./ThemeToggle.svelte";
34
45
let marker: HTMLDivElement;
56
@@ -10,7 +11,7 @@
1011
let angle = $derived.by(() => {
1112
let a = totalMinutes;
1213
if (totalMinutes >= 720) a -= 720;
13-
return mapRange(a, 0, 720, -75, 75); // NOTE: consider radians
14+
return mapRange(a, 0, 720, -85, 85); // NOTE: consider radians
1415
});
1516
1617
let interval: any;
@@ -43,7 +44,7 @@
4344
}
4445
4546
function updateMarker() {
46-
marker.style.transform = `translateY(-15vh) rotate(${angle}deg)`;
47+
marker.style.transform = `rotate(${angle}deg)`;
4748
}
4849
4950
onMount(() => {
@@ -56,24 +57,29 @@
5657
);
5758
}
5859
60+
[timeHours, timeMinutes] = getTime(hasTemporal);
61+
updateMarker();
5962
interval = setInterval(() => {
6063
[timeHours, timeMinutes] = getTime(hasTemporal);
6164
updateMarker();
62-
}, 1000);
65+
}, 10000);
6366
});
6467
6568
onDestroy(() => {
6669
clearInterval(interval);
6770
});
6871
</script>
6972

70-
<div bind:this={marker} class="clock">hi</div>
73+
<div bind:this={marker} class="clock -top-1">
74+
<ThemeToggle />
75+
</div>
76+
7177

7278
<style>
73-
.clock {
74-
position: absolute;
75-
transform-origin: 50% 35vh;
76-
transform: translateY(-15vh) rotate(-90deg);
77-
transition: transform 1s ease-in-out;
78-
}
79+
.clock {
80+
position: absolute;
81+
transform-origin: center 35vw;
82+
transform: rotate(-90deg);
83+
transition: transform 1s ease-in-out;
84+
}
7985
</style>

src/lib/components/ThemeToggle.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
}
5454
</script>
5555

56-
<button bind:this={sunButton} onclick={toggleTheme} class="absolute m-5">
56+
<button bind:this={sunButton} onclick={toggleTheme}>
5757
<img src="/icons/sun.svg" width="64" alt="Sun" class="hover-expand" />
5858
</button>
59-
<button bind:this={moonButton} onclick={toggleTheme} class="absolute m-5">
59+
<button bind:this={moonButton} onclick={toggleTheme}>
6060
<img src="/icons/moon.svg" width="64" alt="Moon" class="hover-expand" />
6161
</button>
6262

6363
<style>
64-
.hover-expand { transition: all 0.5s; }
64+
.hover-expand { transition: all 0.5s; transform: rotate(45deg); }
6565
.hover-expand:hover { scale: 110%; }
6666
</style>

0 commit comments

Comments
 (0)