Merge pull request #33584 from nextcloud/fix/theme-font-preview

nextcloud · Aug 17, 2022 · 2f538bb · 2f538bb
2 parents 48752a9 + eb8d1ff
commit 2f538bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue
@@ -124,11 +124,16 @@ export default {
 
 		updateBodyAttributes() {
 			const enabledThemesIDs = this.themes.filter(theme => theme.enabled === true).map(theme => theme.id)
+			const enabledFontsIDs = this.fonts.filter(font => font.enabled === true).map(font => font.id)
+
 			this.themes.forEach(theme => {
 				document.body.toggleAttribute(`data-theme-${theme.id}`, theme.enabled)
 			})
+			this.fonts.forEach(font => {
+				document.body.toggleAttribute(`data-theme-${font.id}`, font.enabled)
+			})
 
-			document.body.setAttribute('data-themes', enabledThemesIDs.join(','))
+			document.body.setAttribute('data-themes', [...enabledThemesIDs, ...enabledFontsIDs].join(','))
 		},
 
 		/**

diff --git a/apps/theming/src/components/ItemPreview.vue b/apps/theming/src/components/ItemPreview.vue
@@ -67,7 +67,7 @@ export default {
 				return this.selected
 			},
 			set(checked) {
-				console.debug('Selecting theme', this.theme, checked)
+				console.debug('Changed theme', this.theme.id, checked)
 
 				// If this is a radio, we can only enable
 				if (!this.unique) {