From 888c2186433164c60f8908f5df264c247b40e517 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Tue, 26 Mar 2019 15:36:12 +0800 Subject: [PATCH] Fix errors caused by ThemeService --- src/main/java/cc/ryanc/halo/model/support/Theme.java | 5 ----- .../cc/ryanc/halo/service/impl/ThemeServiceImpl.java | 2 +- .../resources/templates/themes/material/theme.properties | 9 +++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/model/support/Theme.java b/src/main/java/cc/ryanc/halo/model/support/Theme.java index 6189d8fdb..5cec0e4f5 100644 --- a/src/main/java/cc/ryanc/halo/model/support/Theme.java +++ b/src/main/java/cc/ryanc/halo/model/support/Theme.java @@ -25,11 +25,6 @@ public class Theme implements Serializable { */ private boolean hasOptions; - /** - * Is internal theme - */ - private boolean isInternal; - /** * Theme properties */ diff --git a/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java index 9b4d79bc0..8870e97b8 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java @@ -145,7 +145,7 @@ public class ThemeServiceImpl implements ThemeService { */ @Override public File getThemeBasePath() { - return new File(System.getProperties().getProperty("user.home"), ".halo/templates/themes"); + return new File(System.getProperties().getProperty("user.home"), "halo/templates/themes"); } /** diff --git a/src/main/resources/templates/themes/material/theme.properties b/src/main/resources/templates/themes/material/theme.properties index e69de29bb..7cfdd712a 100644 --- a/src/main/resources/templates/themes/material/theme.properties +++ b/src/main/resources/templates/themes/material/theme.properties @@ -0,0 +1,9 @@ +theme.id=material +theme.name=Material +theme.website=https://github.com/viosey/hexo-theme-material +theme.description=Nature, Pure | Ô­ÖÊ£¬´¿´â +theme.logo=https://avatars0.githubusercontent.com/u/8141232?s=460&v=4 +theme.version=1.0 +theme.author=Viosey +theme.author.website=https://viosey.com/ +