summaryrefslogtreecommitdiffstats
path: root/apps/theming/src
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2022-10-14 17:54:03 +0200
committerGitHub <noreply@github.com>2022-10-14 17:54:03 +0200
commit2b87aebcc2811653cff500d9f10bce42756fcb39 (patch)
treef64b539e9e660c79747128d08426c50d33a589f4 /apps/theming/src
parentf52bdfadf5198e5df57ae50316a8b9bfe8900b99 (diff)
parent19f35f42bcd527a08952681b07d84d008e583437 (diff)
downloadnextcloud-server-2b87aebcc2811653cff500d9f10bce42756fcb39.tar.gz
nextcloud-server-2b87aebcc2811653cff500d9f10bce42756fcb39.zip
Merge pull request #34599 from nextcloud/fix/background-appdata-scrope
Scope the appdata theming storage for global and users
Diffstat (limited to 'apps/theming/src')
-rw-r--r--apps/theming/src/UserThemes.vue4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue
index 1eeeb3c5b21..f9e729afecb 100644
--- a/apps/theming/src/UserThemes.vue
+++ b/apps/theming/src/UserThemes.vue
@@ -88,7 +88,6 @@ const enforceTheme = loadState('theming', 'enforceTheme', '')
const shortcutsDisabled = loadState('theming', 'shortcutsDisabled', false)
const background = loadState('theming', 'background')
-const backgroundVersion = loadState('theming', 'backgroundVersion')
const themingDefaultBackground = loadState('theming', 'themingDefaultBackground')
const shippedBackgroundList = loadState('theming', 'shippedBackgrounds')
@@ -109,7 +108,6 @@ export default {
enforceTheme,
shortcutsDisabled,
background,
- backgroundVersion,
themingDefaultBackground,
}
},
@@ -169,10 +167,10 @@ export default {
methods: {
updateBackground(data) {
this.background = (data.type === 'custom' || data.type === 'default') ? data.type : data.value
- this.backgroundVersion = data.version
this.updateGlobalStyles()
this.$emit('update:background')
},
+
updateGlobalStyles() {
// Override primary-invert-if-bright and color-primary-text if background is set
const isBackgroundBright = shippedBackgroundList[this.background]?.theming === 'dark'