Skip to content

dashboard: Fix dark theme detection #33300

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
artonge merged 1 commit into from
Jul 27, 2022
Merged

dashboard: Fix dark theme detection #33300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
dashboard: Fix dark theme detection 
When system default color theme is selected for theming,
the enabledThemes array is empty or just contains one entry 'default',
in this case the color theme has to be retrieved from the browser.

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
  • Loading branch information
@susnux @nextcloud-command
susnux authored and nextcloud-command committed Jul 26, 2022
commit 800f6b350ea9ec504c14761f5c9738493eb1d241
6 changes: 4 additions & 2 deletions apps/dashboard/src/helpers/getBackgroundUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ import { generateUrl } from '@nextcloud/router'
import prefixWithBaseUrl from './prefixWithBaseUrl'

export default (background, time = 0, themingDefaultBackground = '') => {
const enabledThemes = window.OCA.Theming.enabledThemes
const isDarkTheme = enabledThemes.join('').indexOf('dark') !== -1
const enabledThemes = window.OCA?.Theming?.enabledThemes || []
const isDarkTheme = (enabledThemes.length === 0 || enabledThemes[0] === 'default')
? window.matchMedia('(prefers-color-scheme: dark)').matches
: enabledThemes.join('').indexOf('dark') !== -1

if (background === 'default') {
if (themingDefaultBackground && themingDefaultBackground !== 'backgroundColor') {
Expand Down
Loading