hexo-theme-lnote 1.2.7 → 1.2.8

package/layout/_partials/comments/changyan.ejs

@@ -1,11 +1,11 @@
-<% if (theme.changyan.appid) { %>
-  <div id="SOHUCS" sid='<%= page.permalink %>'></div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#SOHUCS', function() {
-      LNote.utils.createScript("https://changyan.sohu.com/upload/changyan.js", function() {
-        window.changyan.api.config(<%- JSON.stringify(theme.changyan || {}) %>)
-      });
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.changyan.appid) { %>
+  <div id="SOHUCS" sid='<%= page.permalink %>'></div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#SOHUCS', function() {
+      LNote.utils.createScript("https://changyan.sohu.com/upload/changyan.js", function() {
+        window.changyan.api.config(<%- JSON.stringify(theme.changyan || {}) %>)
+      });
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/cusdis.ejs

@@ -1,25 +1,25 @@
-<% if (theme.cusdis.host && theme.cusdis.app_id) { %>
-  <div class="cusdis" style="width:100%">
-    <div id="cusdis_thread"
-      data-host="<%= theme.cusdis.host %>"
-      data-app-id="<%= theme.cusdis.app_id %>"
-      data-page-id="<%= md5(page.path) %>"
-      data-page-url="<%= page.path %>"
-      data-page-title="<%= page.title %>"
-      data-theme="<%= theme.dark_mode %>"
-    >
-    </div>
-  </div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#cusdis_thread', function() {
-      LNote.utils.createScript('<%= url_join(theme.cusdis.host,
-        `/js/widget/lang/${ String(theme.cusdis.lang || 'zh-cn').toLowerCase() }.js`) %>');
-      LNote.utils.createScript('<%= url_join(theme.cusdis.host, 'js/cusdis.es.js') %>');
-      var schema = document.documentElement.getAttribute('data-bs-theme');
-      if (schema) {
-        document.querySelector('#cusdis_thread').dataset.theme = schema
-      }
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.cusdis.host && theme.cusdis.app_id) { %>
+  <div class="cusdis" style="width:100%">
+    <div id="cusdis_thread"
+      data-host="<%= theme.cusdis.host %>"
+      data-app-id="<%= theme.cusdis.app_id %>"
+      data-page-id="<%= md5(page.path) %>"
+      data-page-url="<%= page.path %>"
+      data-page-title="<%= page.title %>"
+      data-theme="<%= theme.dark_mode %>"
+    >
+    </div>
+  </div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#cusdis_thread', function() {
+      LNote.utils.createScript('<%= url_join(theme.cusdis.host,
+        `/js/widget/lang/${ String(theme.cusdis.lang || 'zh-cn').toLowerCase() }.js`) %>');
+      LNote.utils.createScript('<%= url_join(theme.cusdis.host, 'js/cusdis.es.js') %>');
+      var schema = document.documentElement.getAttribute('data-bs-theme');
+      if (schema) {
+        document.querySelector('#cusdis_thread').dataset.theme = schema
+      }
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/discuss.ejs

@@ -1,17 +1,17 @@
-<% if (theme.discuss && theme.discuss.serverURLs) { %>
-  <div id="discuss-comments"></div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#comments', function() {
-      LNote.utils.createScript('<%= url_join(theme.static_prefix.discuss, 'discuss.js') %>', function() {
-        var options = Object.assign(
-          <%- JSON.stringify(theme.discuss || {}) %>,
-          { el: '#discuss-comments',
-            path: <%= theme.discuss.path %>
-          }
-        )
-        discuss.init(options)
-      });
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.discuss && theme.discuss.serverURLs) { %>
+  <div id="discuss-comments"></div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#comments', function() {
+      LNote.utils.createScript('<%= url_join(theme.static_prefix.discuss, 'discuss.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.discuss || {}) %>,
+          { el: '#discuss-comments',
+            path: <%= theme.discuss.path %>
+          }
+        )
+        discuss.init(options)
+      });
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/disqus.ejs

@@ -1,32 +1,32 @@
-<% if (theme.disqus.shortname) { %>
-  <div class="disqus" style="width:100%">
-    <div id="disqus_thread"></div>
-    <% if (theme.disqus.disqusjs) { %>
-      <script>
-        LNote.utils.loadComments('#disqus_thread', function() {
-          LNote.utils.createCssLink('<%= url_join(theme.static_prefix.disqusjs, 'disqusjs.css') %>');
-          LNote.utils.createScript('<%= url_join(theme.static_prefix.disqusjs, 'disqus.js') %>', function() {
-            new DisqusJS({
-              shortname: '<%= theme.disqus.shortname %>',
-              apikey: '<%= theme.disqus.apikey %>'
-            });
-          });
-        });
-      </script>
-    <% } else { %>
-      <script type="text/javascript">
-        var disqus_config = function() {
-          this.page.url = '<%= page.permalink %>';
-          this.page.identifier = '<%= url_for(page.path) %>';
-        };
-        LNote.utils.loadComments('#disqus_thread', function() {
-          var d = document, s = d.createElement('script');
-          s.src = '//' + '<%= theme.disqus.shortname %>' + '.disqus.com/embed.js';
-          s.setAttribute('data-timestamp', new Date());
-          (d.head || d.body).appendChild(s);
-        });
-      </script>
-    <% } %>
-    <noscript>Please enable JavaScript to view the comments</noscript>
-  </div>
-<% } %>
+<% if (theme.disqus.shortname) { %>
+  <div class="disqus" style="width:100%">
+    <div id="disqus_thread"></div>
+    <% if (theme.disqus.disqusjs) { %>
+      <script>
+        LNote.utils.loadComments('#disqus_thread', function() {
+          LNote.utils.createCssLink('<%= url_join(theme.static_prefix.disqusjs, 'disqusjs.css') %>');
+          LNote.utils.createScript('<%= url_join(theme.static_prefix.disqusjs, 'disqus.js') %>', function() {
+            new DisqusJS({
+              shortname: '<%= theme.disqus.shortname %>',
+              apikey: '<%= theme.disqus.apikey %>'
+            });
+          });
+        });
+      </script>
+    <% } else { %>
+      <script type="text/javascript">
+        var disqus_config = function() {
+          this.page.url = '<%= page.permalink %>';
+          this.page.identifier = '<%= url_for(page.path) %>';
+        };
+        LNote.utils.loadComments('#disqus_thread', function() {
+          var d = document, s = d.createElement('script');
+          s.src = '//' + '<%= theme.disqus.shortname %>' + '.disqus.com/embed.js';
+          s.setAttribute('data-timestamp', new Date());
+          (d.head || d.body).appendChild(s);
+        });
+      </script>
+    <% } %>
+    <noscript>Please enable JavaScript to view the comments</noscript>
+  </div>
+<% } %>

package/layout/_partials/comments/giscus.ejs

@@ -1,36 +1,36 @@
-<% if (theme.giscus && theme.giscus['repo'] && theme.giscus['repo-id']) { %>
-    <div id="giscus" class="giscus"></div>
-    <script type="text/javascript">
-      LNote.utils.loadComments('#giscus', function() {
-        var options = <%- JSON.stringify(theme.giscus || {}) %>;
-        var attributes = {};
-        for (let option in options) {
-          if (!option.startsWith('theme-')) {
-            var key = option.startsWith('data-') ? option : 'data-' + option;
-            attributes[key] = options[option];
-          }
-        }
-        var light = '<%= theme.giscus['theme-light'] || 'light' %>';
-        var dark = '<%= theme.giscus['theme-dark'] || 'dark' %>';
-        window.GiscusThemeLight = light;
-        window.GiscusThemeDark = dark;
-        attributes['data-theme'] = document.documentElement.getAttribute('data-bs-theme') === 'dark' ? dark : light;
-        for (let attribute in attributes) {
-          var value = attributes[attribute];
-          if (value === undefined || value === null || value === '') {
-            delete attributes[attribute];
-          }
-        }
-        var s = document.createElement('script');
-        s.setAttribute('src', 'https://giscus.app/client.js');
-        s.setAttribute('crossorigin', 'anonymous');
-        for (let attribute in attributes) {
-          s.setAttribute(attribute, attributes[attribute]);
-        }
-        var ss = document.getElementsByTagName('script');
-        var e = ss.length > 0 ? ss[ss.length - 1] : document.head || document.documentElement;
-        e.parentNode.insertBefore(s, e.nextSibling);
-      });
-    </script>
-    <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.giscus && theme.giscus['repo'] && theme.giscus['repo-id']) { %>
+    <div id="giscus" class="giscus"></div>
+    <script type="text/javascript">
+      LNote.utils.loadComments('#giscus', function() {
+        var options = <%- JSON.stringify(theme.giscus || {}) %>;
+        var attributes = {};
+        for (let option in options) {
+          if (!option.startsWith('theme-')) {
+            var key = option.startsWith('data-') ? option : 'data-' + option;
+            attributes[key] = options[option];
+          }
+        }
+        var light = '<%= theme.giscus['theme-light'] || 'light' %>';
+        var dark = '<%= theme.giscus['theme-dark'] || 'dark' %>';
+        window.GiscusThemeLight = light;
+        window.GiscusThemeDark = dark;
+        attributes['data-theme'] = document.documentElement.getAttribute('data-bs-theme') === 'dark' ? dark : light;
+        for (let attribute in attributes) {
+          var value = attributes[attribute];
+          if (value === undefined || value === null || value === '') {
+            delete attributes[attribute];
+          }
+        }
+        var s = document.createElement('script');
+        s.setAttribute('src', 'https://giscus.app/client.js');
+        s.setAttribute('crossorigin', 'anonymous');
+        for (let attribute in attributes) {
+          s.setAttribute(attribute, attributes[attribute]);
+        }
+        var ss = document.getElementsByTagName('script');
+        var e = ss.length > 0 ? ss[ss.length - 1] : document.head || document.documentElement;
+        e.parentNode.insertBefore(s, e.nextSibling);
+      });
+    </script>
+    <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/gitalk.ejs

@@ -1,19 +1,19 @@
-<% if(theme.gitalk.clientID && theme.gitalk.clientSecret && theme.gitalk.repo){ %>
-  <div id="gitalk-container"></div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#gitalk-container', function() {
-      LNote.utils.createCssLink('<%= url_join(theme.static_prefix.internal_css, 'gitalk.css') %>')
-      LNote.utils.createScript('<%= url_join(theme.static_prefix.gitalk, 'gitalk.min.js') %>', function() {
-        var options = Object.assign(
-          <%- JSON.stringify(theme.gitalk || {}) %>,
-          {
-            id: '<%= md5(page.path) %>'
-          }
-        )
-        var gitalk = new Gitalk(options);
-        gitalk.render('gitalk-container');
-      });
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if(theme.gitalk.clientID && theme.gitalk.clientSecret && theme.gitalk.repo){ %>
+  <div id="gitalk-container"></div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#gitalk-container', function() {
+      LNote.utils.createCssLink('<%= url_join(theme.static_prefix.internal_css, 'gitalk.css') %>')
+      LNote.utils.createScript('<%= url_join(theme.static_prefix.gitalk, 'gitalk.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.gitalk || {}) %>,
+          {
+            id: '<%= md5(page.path) %>'
+          }
+        )
+        var gitalk = new Gitalk(options);
+        gitalk.render('gitalk-container');
+      });
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/livere.ejs

@@ -1,10 +1,10 @@
-<% if (theme.livere.uid) { %>
-  <div id="lv-container" data-id="city" data-uid="<%= theme.livere.uid %>">
-    <script type="text/javascript">
-      LNote.utils.loadComments('#lv-container', function() {
-        LNote.utils.createScript('https://cdn-city.livere.com/js/embed.dist.js');
-      });
-    </script>
-    <noscript>Please enable JavaScript to view the comments</noscript>
-  </div>
-<% } %>
+<% if (theme.livere.uid) { %>
+  <div id="lv-container" data-id="city" data-uid="<%= theme.livere.uid %>">
+    <script type="text/javascript">
+      LNote.utils.loadComments('#lv-container', function() {
+        LNote.utils.createScript('https://cdn-city.livere.com/js/embed.dist.js');
+      });
+    </script>
+    <noscript>Please enable JavaScript to view the comments</noscript>
+  </div>
+<% } %>

package/layout/_partials/comments/remark42.ejs

@@ -1,29 +1,29 @@
-<% if (theme.remark42.host && theme.remark42.site_id) { %>
-  <div id="remark42"></div>
-  <script type="text/javascript">
-    var schema = document.documentElement.getAttribute('data-bs-theme');
-    if (schema !== 'light' && schema !== 'dark') {
-      schema = 'light';
-    }
-    var remark_config = Object.assign(
-      <%- JSON.stringify(theme.remark42 || {}) %>,
-      {
-        url: '<%= url_for(page.path) %>',
-        page_title: '<%= page.title %>',
-        theme: schema,
-      }
-    );
-
-    LNote.utils.loadComments('#remark42', function() {
-      (function (c) {
-        for (var i = 0; i < c.length; i++) {
-          var d = document, s = d.createElement('script');
-          s.src = remark_config.host + '/web/' + c[i] + '.js';
-          s.defer = true;
-          (d.head || d.body).appendChild(s);
-        }
-      })(remark_config.components || ['embed']);
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.remark42.host && theme.remark42.site_id) { %>
+  <div id="remark42"></div>
+  <script type="text/javascript">
+    var schema = document.documentElement.getAttribute('data-bs-theme');
+    if (schema !== 'light' && schema !== 'dark') {
+      schema = 'light';
+    }
+    var remark_config = Object.assign(
+      <%- JSON.stringify(theme.remark42 || {}) %>,
+      {
+        url: '<%= url_for(page.path) %>',
+        page_title: '<%= page.title %>',
+        theme: schema,
+      }
+    );
+
+    LNote.utils.loadComments('#remark42', function() {
+      (function (c) {
+        for (var i = 0; i < c.length; i++) {
+          var d = document, s = d.createElement('script');
+          s.src = remark_config.host + '/web/' + c[i] + '.js';
+          s.defer = true;
+          (d.head || d.body).appendChild(s);
+        }
+      })(remark_config.components || ['embed']);
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/twikoo.ejs

@@ -1,25 +1,25 @@
-<% if (theme.twikoo && theme.twikoo.envId) { %>
-  <div id="twikoo"></div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#comments', function() {
-      LNote.utils.createScript('<%= url_join(theme.static_prefix.twikoo, 'twikoo.all.min.js') %>', function() {
-        var options = Object.assign(
-          <%- JSON.stringify(theme.twikoo || {}) %>,
-          {
-            el: '#twikoo',
-            path: '<%= theme.twikoo.path %>',
-            onCommentLoaded: function() {
-              LNote.utils.listenDOMLoaded(function() {
-                var imgSelector = '#twikoo .tk-content img:not(.tk-owo-emotion)';
-                LNote.plugins.imageCaption(imgSelector);
-                LNote.plugins.fancyBox(imgSelector);
-              });
-            }
-          }
-        )
-        twikoo.init(options)
-      });
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.twikoo && theme.twikoo.envId) { %>
+  <div id="twikoo"></div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#comments', function() {
+      LNote.utils.createScript('<%= url_join(theme.static_prefix.twikoo, 'twikoo.all.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.twikoo || {}) %>,
+          {
+            el: '#twikoo',
+            path: '<%= theme.twikoo.path %>',
+            onCommentLoaded: function() {
+              LNote.utils.listenDOMLoaded(function() {
+                var imgSelector = '#twikoo .tk-content img:not(.tk-owo-emotion)';
+                LNote.plugins.imageCaption(imgSelector);
+                LNote.plugins.fancyBox(imgSelector);
+              });
+            }
+          }
+        )
+        twikoo.init(options)
+      });
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/utterances.ejs

@@ -1,27 +1,27 @@
-<% if (theme.utterances.repo && theme.utterances.issue_term) { %>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#comments', function() {
-      var light = '<%= theme.utterances.theme || 'github-light' %>';
-      var dark = '<%= theme.utterances.theme_dark || 'github-dark' %>';
-      var schema = document.documentElement.getAttribute('data-bs-theme');
-      if (schema === 'dark') {
-        schema = dark;
-      } else {
-        schema = light;
-      }
-      window.UtterancesThemeLight = light;
-      window.UtterancesThemeDark = dark;
-      var s = document.createElement('script');
-      s.setAttribute('src', 'https://utteranc.es/client.js');
-      s.setAttribute('repo', '<%= theme.utterances.repo %>');
-      s.setAttribute('issue-term', '<%= theme.utterances.issue_term %>');
-      <% if (theme.utterances.label) { %>
-      s.setAttribute('label', '<%= theme.utterances.label %>');
-      <% } %>
-      s.setAttribute('theme', schema);
-      s.setAttribute('crossorigin', 'anonymous');
-      document.getElementById('comments').appendChild(s);
-    })
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.utterances.repo && theme.utterances.issue_term) { %>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#comments', function() {
+      var light = '<%= theme.utterances.theme || 'github-light' %>';
+      var dark = '<%= theme.utterances.theme_dark || 'github-dark' %>';
+      var schema = document.documentElement.getAttribute('data-bs-theme');
+      if (schema === 'dark') {
+        schema = dark;
+      } else {
+        schema = light;
+      }
+      window.UtterancesThemeLight = light;
+      window.UtterancesThemeDark = dark;
+      var s = document.createElement('script');
+      s.setAttribute('src', 'https://utteranc.es/client.js');
+      s.setAttribute('repo', '<%= theme.utterances.repo %>');
+      s.setAttribute('issue-term', '<%= theme.utterances.issue_term %>');
+      <% if (theme.utterances.label) { %>
+      s.setAttribute('label', '<%= theme.utterances.label %>');
+      <% } %>
+      s.setAttribute('theme', schema);
+      s.setAttribute('crossorigin', 'anonymous');
+      document.getElementById('comments').appendChild(s);
+    })
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/valine.ejs

@@ -1,23 +1,23 @@
-<% if (theme.valine.appId && theme.valine.appKey) { %>
-  <div id="valine"></div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#valine', function() {
-      LNote.utils.createScript('<%= url_join(theme.static_prefix.valine, 'Valine.min.js') %>', function() {
-        var options = Object.assign(
-          <%- JSON.stringify(theme.valine || {}) %>,
-          {
-            el: "#valine",
-            path: <%= theme.valine.path %>
-          }
-        )
-        new Valine(options);
-        LNote.utils.waitElementVisible('#valine .vcontent', () => {
-          var imgSelector = '#valine .vcontent img:not(.vemoji)';
-          LNote.plugins.imageCaption(imgSelector);
-          LNote.plugins.fancyBox(imgSelector);
-        })
-      });
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.valine.appId && theme.valine.appKey) { %>
+  <div id="valine"></div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#valine', function() {
+      LNote.utils.createScript('<%= url_join(theme.static_prefix.valine, 'Valine.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.valine || {}) %>,
+          {
+            el: "#valine",
+            path: <%= theme.valine.path %>
+          }
+        )
+        new Valine(options);
+        LNote.utils.waitElementVisible('#valine .vcontent', () => {
+          var imgSelector = '#valine .vcontent img:not(.vemoji)';
+          LNote.plugins.imageCaption(imgSelector);
+          LNote.plugins.fancyBox(imgSelector);
+        })
+      });
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments/waline.ejs

@@ -1,24 +1,24 @@
-<% if (theme.waline.serverURL) { %>
-  <div id="waline"></div>
-  <script type="text/javascript">
-    LNote.utils.loadComments('#waline', function() {
-      LNote.utils.createCssLink('<%= url_join(theme.static_prefix.waline, 'waline.min.css') %>')
-      LNote.utils.createScript('<%= url_join(theme.static_prefix.waline, 'waline.min.js') %>', function() {
-        var options = Object.assign(
-          <%- JSON.stringify(theme.waline || {}) %>,
-          {
-            el: '#waline',
-            path: <%= theme.waline.path %>
-          }
-        )
-        Waline.init(options);
-        LNote.utils.waitElementVisible('#waline .vcontent', () => {
-          var imgSelector = '#waline .vcontent img:not(.vemoji)';
-          LNote.plugins.imageCaption(imgSelector);
-          LNote.plugins.fancyBox(imgSelector);
-        })
-      });
-    });
-  </script>
-  <noscript>Please enable JavaScript to view the comments</noscript>
-<% } %>
+<% if (theme.waline.serverURL) { %>
+  <div id="waline"></div>
+  <script type="text/javascript">
+    LNote.utils.loadComments('#waline', function() {
+      LNote.utils.createCssLink('<%= url_join(theme.static_prefix.waline, 'waline.min.css') %>')
+      LNote.utils.createScript('<%= url_join(theme.static_prefix.waline, 'waline.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.waline || {}) %>,
+          {
+            el: '#waline',
+            path: <%= theme.waline.path %>
+          }
+        )
+        Waline.init(options);
+        LNote.utils.waitElementVisible('#waline .vcontent', () => {
+          var imgSelector = '#waline .vcontent img:not(.vemoji)';
+          LNote.plugins.imageCaption(imgSelector);
+          LNote.plugins.fancyBox(imgSelector);
+        })
+      });
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partials/comments.ejs

@@ -1,8 +1,8 @@
-<% if ((!is_post() && !is_page()) || (is_post() && theme.post.comments.enable && page.comments) || (is_page() && page.comments)) { %>
-  <% var commentType = typeof page.comment === 'string' && page.comment !== '' ? page.comment : theme.post.comments.type %>
-  <% if (commentType) { %>
-    <article id="comments">
-      <%- partial('_partials/comments/' + commentType) %>
-    </article>
-  <% } %>
-<% } %>
+<% if ((!is_post() && !is_page()) || (is_post() && theme.post.comments.enable && page.comments) || (is_page() && page.comments)) { %>
+  <% var commentType = typeof page.comment === 'string' && page.comment !== '' ? page.comment : theme.post.comments.type %>
+  <% if (commentType) { %>
+    <article id="comments">
+      <%- partial('_partials/comments/' + commentType) %>
+    </article>
+  <% } %>
+<% } %>

package/layout/_partials/css.ejs

@@ -1,10 +1,10 @@
-<%- all_html_link('css') %>
-<%- partial('_partials/post/css.ejs') %>
-
-<%- css('//at.alicdn.com/t/font_1749284_hj8rtnfg7um.css') %>
-
-<%# if (theme.custom_css) { %>
-  <%#- css(theme.custom_css) %>
-<%# } %>
-
+<%- all_html_link('css') %>
+<%- partial('_partials/post/css.ejs') %>
+
+<%- css('//at.alicdn.com/t/font_1749284_hj8rtnfg7um.css') %>
+
+<%# if (theme.custom_css) { %>
+  <%#- css(theme.custom_css) %>
+<%# } %>
+
 <%- my_post_css(page) %>