Merge branch 'master' of github.com:Lissy93/dashy into FEATURE/multi-page-support-2

2022-04-30 23:26:37 +01:00
parent a7a7032b1d 6018a49bed
commit 238c51ae64
8 changed files with 183 additions and 166 deletions
--- a/src/components/Settings/ThemeSelector.vue
+++ b/src/components/Settings/ThemeSelector.vue
@@ -75,7 +75,8 @@ export default {
    themeNames: function themeNames() {
      const externalThemeNames = Object.keys(this.externalThemes);
      const specialThemes = ['custom'];
-      return [...externalThemeNames, ...Defaults.builtInThemes, ...specialThemes];
+      return [...this.extraThemeNames, ...externalThemeNames,
+        ...Defaults.builtInThemes, ...specialThemes];
    },
    extraThemeNames() {
      const userThemes = this.appConfig.cssThemes || [];