update

5 years ago · 033c4765f3
parent 243a6f369e
commit 033c4765f3
9 changed files with 21 additions and 26 deletions
--- 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](/)'


 ############################### 评论 ###############################
--- 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') %>
              <% } %>
            </div>
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@ -16,7 +16,7 @@
  <%}%>
  <br>
  <div><%- markdown(__('footer.license')) %></div>
-  <div><%- __('footer.use') %> <a href="https://xaoxuu.com/wiki/material-x/" target="_blank" class="codename">Material X</a> <%- __('footer.theme') %><% if (theme.services.busuanzi == true) { %><%- __('symbol.comma') %><%- __('footer.total_views') %> <span id="busuanzi_value_site_pv"><i class="fas fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span> <%- __('footer.times') %><% } %><%- __('symbol.period') %>
+  <div><%- __('footer.use') %> <a href="https://xaoxuu.com/wiki/material-x/" target="_blank" class="codename">Material X</a> <%- __('footer.theme') %><% if (theme.busuanzi == true) { %><%- __('symbol.comma') %><%- __('footer.total_views') %> <span id="busuanzi_value_site_pv"><i class="fas fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span> <%- __('footer.times') %><% } %><%- __('symbol.period') %>
  </div>
 </footer>
 <script>setLoadingBarProgress(80);</script>
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@ -46,7 +46,7 @@

  <!-- link -->
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
-  <% if (theme.services.nodewaves == true) { %>
+  <% if (theme.nodewaves == true) { %>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/node-waves@0.7.6/dist/waves.min.css">
  <% } %>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.6.3/css/all.min.css">
--- 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) { %>
          <div class="new-meta-item browse busuanzi">
            <a class='notlink'>
              <i class="fas fa-eye" aria-hidden="true"></i>
--- a/layout/_partial/scripts.ejs
+++ b/layout/_partial/scripts.ejs
@ -16,7 +16,7 @@
  </script>
 <% } %>

-<% if (theme.services.scrollreveal == true) { %>
+<% if (theme.scrollreveal == true) { %>
  <script async src="https://cdn.jsdelivr.net/npm/scrollreveal@4.0.5/dist/scrollreveal.min.js"></script>
  <script type="text/javascript">
    $(function() {
@ -27,7 +27,7 @@
    });
  </script>
 <% } %>
-<% if (theme.services.nodewaves == true) { %>
+<% if (theme.nodewaves == true) { %>
  <script src="https://cdn.jsdelivr.net/npm/node-waves@0.7.6/dist/waves.min.js"></script>
  <script type="text/javascript">
    $(function() {
@ -41,10 +41,10 @@
    });
  </script>
 <% } %>
-<% if (theme.services.busuanzi == true) { %>
+<% if (theme.busuanzi == true) { %>
  <script async src="https://cdn.jsdelivr.net/gh/xaoxuu/cdn-busuanzi@2.3/js/busuanzi.pure.mini.js"></script>
 <% } %>
-<% if (theme.services.fastclick == true) { %>
+<% if (theme.fastclick == true) { %>
  <!-- fastclick -->
  <script src="https://cdn.jsdelivr.net/npm/fastclick@1.0.6/lib/fastclick.min.js"></script>
  <script>
@ -53,11 +53,7 @@
    }, false)
  </script>
 <% } %>
-<% if (theme.services.share == true && config.mob && config.mob.app_key) { %>
-  <% if (page.layout == 'post' && page.share != false) { %>
-    <script id="-mob-share" src="//f1.webshare.mob.com/code/mob-share.js?appkey=<%- config.mob.app_key %>"></script>
-  <% } %>
-<% } %>
+

 <%
  var enableDisqus = false;
--- 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) { %>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.css">
  <div class="aplayer"
    data-theme="<%- aplayer_theme != undefined ? aplayer_theme : theme.music.color %>"
--- a/layout/_third-party/share.ejs
+++ b/layout/_third-party/share.ejs
@ -1,4 +1,4 @@
-<% if (theme.services.share == true && theme.share && page.layout == 'post' && page.share != false) { %>
+<% if (theme.share && page.layout == 'post' && page.share != false) { %>
  <div class="new-meta-item share -mob-share-list">
    <i class="fas fa-share-alt" aria-hidden="true"></i>
    <div class="-mob-share-list share-body">
--- a/layout/_widget/music.ejs
+++ b/layout/_widget/music.ejs
@ -8,7 +8,7 @@ if (page.widget && page.widget.music == false) {
 }
 %>

-<% if (theme.services.music == true && needDisplay == true) { %>
+<% if (theme.music && theme.music.enable == true && needDisplay == true) { %>
  <section class='<%- item.widget %>'>
    <%- partial('header', {item: item, defIcon: '', defTitle: ''}) %>
    <div class='content <%= theme.style %>'>