diff --git a/_config.yml b/_config.yml index 5c5608a..4af9c2a 100755 --- a/_config.yml +++ b/_config.yml @@ -6,8 +6,8 @@ info: css: # style: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.4.6/css/style.css js: - app: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.4.6/js/app.js - search: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.4.6/js/search.js + # app: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.4.6/js/app.js + # search: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@19.4.6/js/search.js volantis: https://cdn.jsdelivr.net/gh/xaoxuu/volantis@1/js/volantis.min.js @@ -18,19 +18,18 @@ style: pure # pure: 导航栏和标题栏背景是白色 ############################### 服务开关 ############################### +scrollreveal: true +nodewaves: true +busuanzi: true +# fastclick: true + -services: - scrollreveal: true - nodewaves: true - busuanzi: true - # fastclick: true - # music: true - # share: true ############################### 默认值 ############################### # 音乐控件的默认配置,如果sidebar或者page里没有提供,就取这里的参数 music: + enable: true # 是否启用 color: '#1BCDFC' # 主题色 mode: circulation # random (随机) single (单曲) circulation (列表循环) order (列表) server: netease # netease(网易云音乐)tencent(QQ音乐) xiami(虾米) kugou(酷狗) @@ -186,7 +185,7 @@ share: -# footer: 页脚文字,支持markdown +# footer: '页脚文字,支持[markdown](/)' ############################### 评论 ############################### diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs index a946488..a82a563 100755 --- a/layout/_partial/article.ejs +++ b/layout/_partial/article.ejs @@ -25,7 +25,7 @@ %> <%- items.join(' ') %> <% } %> - <% if (theme.services.share == true && theme.share && (!page.meta || page.meta.share != false)) { %> + <% if (theme.share && (!page.meta || page.meta.share != false)) { %> <%- partial('../_third-party/share') %> <% } %> diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs index 6a95400..3fa2bb5 100755 --- a/layout/_partial/footer.ejs +++ b/layout/_partial/footer.ejs @@ -16,7 +16,7 @@ <%}%>
<%- markdown(__('footer.license')) %>
-
<%- __('footer.use') %> Material X <%- __('footer.theme') %><% if (theme.services.busuanzi == true) { %><%- __('symbol.comma') %><%- __('footer.total_views') %> <%- __('footer.times') %><% } %><%- __('symbol.period') %> +
<%- __('footer.use') %> Material X <%- __('footer.theme') %><% if (theme.busuanzi == true) { %><%- __('symbol.comma') %><%- __('footer.total_views') %> <%- __('footer.times') %><% } %><%- __('symbol.period') %>
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs index ee55832..f9f8302 100755 --- a/layout/_partial/head.ejs +++ b/layout/_partial/head.ejs @@ -46,7 +46,7 @@ - <% if (theme.services.nodewaves == true) { %> + <% if (theme.nodewaves == true) { %> <% } %> diff --git a/layout/_partial/meta.ejs b/layout/_partial/meta.ejs index 34f5a2b..1c9c35c 100644 --- a/layout/_partial/meta.ejs +++ b/layout/_partial/meta.ejs @@ -68,7 +68,7 @@ <% } %> <% } %> <% if(!isPostList && (!post.meta || post.meta.counter != false)){ %> - <% if (theme.services.busuanzi == true) { %> + <% if (theme.busuanzi == true) { %>
diff --git a/layout/_partial/scripts.ejs b/layout/_partial/scripts.ejs index fe5c806..786a236 100755 --- a/layout/_partial/scripts.ejs +++ b/layout/_partial/scripts.ejs @@ -16,7 +16,7 @@ <% } %> -<% if (theme.services.scrollreveal == true) { %> +<% if (theme.scrollreveal == true) { %> <% } %> -<% if (theme.services.nodewaves == true) { %> +<% if (theme.nodewaves == true) { %> <% } %> -<% if (theme.services.busuanzi == true) { %> +<% if (theme.busuanzi == true) { %> <% } %> -<% if (theme.services.fastclick == true) { %> +<% if (theme.fastclick == true) { %> <% } %> -<% if (theme.services.share == true && config.mob && config.mob.app_key) { %> - <% if (page.layout == 'post' && page.share != false) { %> - - <% } %> -<% } %> + <% var enableDisqus = false; diff --git a/layout/_third-party/aplayer.ejs b/layout/_third-party/aplayer.ejs index 56238e6..c1cf813 100644 --- a/layout/_third-party/aplayer.ejs +++ b/layout/_third-party/aplayer.ejs @@ -1,4 +1,4 @@ -<% if (theme.services.music == true) { %> +<% if (theme.music && theme.music.enable == true) { %>
+<% if (theme.share && page.layout == 'post' && page.share != false) { %>