Skip to content

Respect OS color scheme preference #853

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

Merged
krusche merged 4 commits into from
Mar 2, 2026
Merged

Respect OS color scheme preference #853

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03b0a04
Client: Respect OS color scheme preference
krusche Feb 22, 2026
6b613cf
Update client/src/components/ColorSchemeToggleButton/ColorSchemeToggl…
krusche Feb 22, 2026
8733e39
Merge branch 'develop' into feature/respect-os-color-scheme
krusche Mar 1, 2026
5b4c98d
Merge branch 'develop' into feature/respect-os-color-scheme
krusche Mar 1, 2026
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
2 changes: 1 addition & 1 deletion client/src/app/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const theme = createTheme({

const App = () => {
return (
<MantineProvider defaultColorScheme='dark' theme={theme}>
<MantineProvider defaultColorScheme='auto' theme={theme}>
<AuthenticationProvider>
<AppRoutes />
<Notifications limit={5} position='top-right' />
Expand Down
21 changes: 17 additions & 4 deletions client/src/components/ColorSchemeToggleButton/ColorSchemeToggleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Moon, Sun } from '@phosphor-icons/react'
import { ActionIcon, useMantineColorScheme, type BoxProps } from '@mantine/core'
import { useMediaQuery } from '@mantine/hooks'

interface ColorSchemeToggleButtonProps extends BoxProps {
iconSize?: number | string
Expand All @@ -11,18 +12,30 @@ export const ColorSchemeToggleButton = ({
size = 'md',
...props
}: ColorSchemeToggleButtonProps) => {
const { colorScheme, toggleColorScheme } = useMantineColorScheme()
const { colorScheme, toggleColorScheme, clearColorScheme } = useMantineColorScheme()
const prefersDarkColorScheme = useMediaQuery('(prefers-color-scheme: dark)')

const showSunIcon = (colorScheme === 'auto' && prefersDarkColorScheme) || colorScheme === 'dark'

return (
<ActionIcon
variant='outline'
color={colorScheme === 'dark' ? 'gray.4' : 'dark.2'}
onClick={() => toggleColorScheme()}
color={showSunIcon ? 'gray.4' : 'dark.2'}
onClick={() => {
if (
(colorScheme === 'dark' && !prefersDarkColorScheme) ||
(colorScheme === 'light' && prefersDarkColorScheme)
) {
clearColorScheme()
} else {
toggleColorScheme()
}
}}
title='Toggle color scheme'
size={size}
{...props}
>
{colorScheme === 'dark' ? <Sun size={iconSize} /> : <Moon size={iconSize} />}
{showSunIcon ? <Sun size={iconSize} /> : <Moon size={iconSize} />}
</ActionIcon>
)
}
Loading