fix merge conflict

This commit is contained in:
Danny Liu 2024-03-16 23:27:08 -07:00
parent db0712aefd
commit f55dae3027

View file

@ -117,9 +117,9 @@
function handleThemeChange(newTheme: string) { function handleThemeChange(newTheme: string) {
selectedTheme = newTheme; selectedTheme = newTheme;
setTheme(newTheme); // Update the store setTheme(newTheme);
localStorage.setItem('theme', newTheme); // Persist the theme selection localStorage.setItem('theme', newTheme);
applyTheme(newTheme); // Apply the selected theme applyTheme(newTheme);
} }
</script> </script>
@ -133,7 +133,7 @@
<div class="flex items-center relative"> <div class="flex items-center relative">
<select <select
class=" dark:bg-gray-900 w-fit pr-8 rounded py-2 px-2 text-xs bg-transparent outline-none text-right" class=" dark:bg-gray-900 w-fit pr-8 rounded py-2 px-2 text-xs bg-transparent outline-none text-right"
bind:value={theme} bind:value={selectedTheme}
placeholder="Select a theme" placeholder="Select a theme"
on:change="{() => handleThemeChange(selectedTheme)}" on:change="{() => handleThemeChange(selectedTheme)}"
> >