Skip to content

[stable30] fix: make dark header configurable #2545

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
skjnldsv merged 2 commits into from
Sep 17, 2024
Merged

[stable30] fix: make dark header configurable #2545

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e89de
fix: set light backdrop according to theme
susnux Sep 17, 2024
7a42352
chore(assets): Recompile assets
nextcloud-command Sep 17, 2024
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
Next Next commit
fix: set light backdrop according to theme 
Required to fix regression with Text in Viewer in Nextcloud 30, where we
still want a white viewer header.

Also fixes the header color for PDFs with light theme.
Fixes: nextcloud/text#6386

Co-authored-by: Jonas <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @mejo-
susnux and mejo- committed Sep 17, 2024
commit f6e89dee24f0daa99e15b46f94acae6a85b7340c
29 changes: 14 additions & 15 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@nextcloud/paths": "^2.2.1",
"@nextcloud/router": "^3.0.1",
"@nextcloud/typings": "^1.9.1",
"@nextcloud/vue": "^8.18.0",
"@nextcloud/vue": "^8.19.0",
"@skjnldsv/vue-plyr": "^7.5.0",
"camelcase": "^8.0.0",
"debounce": "^2.1.1",
Expand Down
4 changes: 4 additions & 0 deletions src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
:clear-view-delay="-1 /* disable fade-out because of accessibility reasons */"
:close-button-contained="false"
:dark="true"
:light-backdrop="lightBackdrop"
:data-handler="handlerId"
:enable-slideshow="hasPrevious || hasNext"
:slideshow-paused="editing"
Expand Down Expand Up @@ -286,6 +287,7 @@ export default {
canSwipe: true,
isStandalone: false,
theme: null,
lightBackdrop: null,
root: davRemoteURL,
handlerId: '',

Expand Down Expand Up @@ -687,6 +689,8 @@ export default {
}

this.theme = handler.theme ?? 'dark'
const defaultThemeIsLight = window.getComputedStyle(document.body).getPropertyValue('--background-invert-if-dark') !== 'invert(100%)'
this.lightBackdrop = handler.theme === 'light' || (handler.theme === 'default' && defaultThemeIsLight)
this.handlerId = handler.id

// check if part of a group, if so retrieve full files list
Expand Down