diff --git a/web/src/components/buttons/SettingsCheckbox.svelte b/web/src/components/buttons/SettingsCheckbox.svelte deleted file mode 100644 index 568bc41b..00000000 --- a/web/src/components/buttons/SettingsCheckbox.svelte +++ /dev/null @@ -1,100 +0,0 @@ - - - - - diff --git a/web/src/components/buttons/SettingsToggle.svelte b/web/src/components/buttons/SettingsToggle.svelte new file mode 100644 index 00000000..ef253ac2 --- /dev/null +++ b/web/src/components/buttons/SettingsToggle.svelte @@ -0,0 +1,72 @@ + + +
+ + + {#if description} +
{description}
+ {/if} +
+ + diff --git a/web/src/components/buttons/Switcher.svelte b/web/src/components/buttons/Switcher.svelte index b836105e..4b0cb333 100644 --- a/web/src/components/buttons/Switcher.svelte +++ b/web/src/components/buttons/Switcher.svelte @@ -28,16 +28,15 @@ } .switcher.big { - --switcher-inner-padding: 4px; - border-radius: calc(var(--border-radius) + var(--switcher-inner-padding)); background: var(--button); box-shadow: var(--button-box-shadow); - padding: var(--switcher-inner-padding); + padding: var(--sidebar-inner-padding); } .switcher.big :global(.button) { width: 100%; - height: calc(40px - var(--switcher-inner-padding)); + height: calc(40px - var(--sidebar-inner-padding)); + border-radius: calc(var(--border-radius) - var(--sidebar-inner-padding));; } .switcher.big :global(.button:not(:focus-visible)) { diff --git a/web/src/components/misc/Toggle.svelte b/web/src/components/misc/Toggle.svelte new file mode 100644 index 00000000..ed0dbb31 --- /dev/null +++ b/web/src/components/misc/Toggle.svelte @@ -0,0 +1,42 @@ + + +
+
+
+ + diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte index 719fb173..163600ec 100644 --- a/web/src/routes/+layout.svelte +++ b/web/src/routes/+layout.svelte @@ -2,11 +2,10 @@ import "@fontsource/ibm-plex-mono/400.css"; import "@fontsource/ibm-plex-mono/500.css"; + import device from "$lib/device"; import currentTheme, { statusBarColors } from "$lib/state/theme"; import Sidebar from "$components/sidebar/Sidebar.svelte"; - - import device from "$lib/device"; @@ -45,7 +44,10 @@ --sidebar-highlight: #ffffff; --sidebar-hover: rgba(255, 255, 255, 0.1); - --input-border: #8d8d95; + --input-border: var(--gray); + + --toggle-bg: var(--input-border); + --toggle-bg-enabled: var(--secondary); --padding: 12px; --border-radius: 11px; @@ -85,6 +87,9 @@ --input-border: #383838; + --toggle-bg: var(--input-border); + --toggle-bg-enabled: #777777; + --sidebar-mobile-gradient: linear-gradient( 90deg, rgba(16, 16, 16, 0.9) 0%, @@ -217,9 +222,10 @@ } :global(.subtext) { - font-size: 13px; + font-size: 12px; color: var(--gray); line-height: 1.4; + padding: 0 var(--padding); } #cobalt { diff --git a/web/src/routes/settings/general/appearance/+page.svelte b/web/src/routes/settings/general/appearance/+page.svelte index 68022510..dd4b679b 100644 --- a/web/src/routes/settings/general/appearance/+page.svelte +++ b/web/src/routes/settings/general/appearance/+page.svelte @@ -2,7 +2,7 @@ import SettingsCategory from "$components/settings/SettingsCategory.svelte"; import Switcher from "$components/buttons/Switcher.svelte"; import SettingsButton from "$components/buttons/SettingsButton.svelte"; - import SettingsCheckbox from "$components/buttons/SettingsCheckbox.svelte"; + import SettingsToggle from "$components/buttons/SettingsToggle.svelte"; import { themeOptions } from "$lib/types/settings"; @@ -18,13 +18,13 @@ - - - - @@ -22,7 +22,7 @@ - - - -