Merge branch 'release_v4.0.1' into develop

assets/css/_common/components/post/post-header.scss

@@ -114,7 +114,7 @@
   height: 0;
 }
 
-@if $busuanzi_enable and $busuanzi_post_views {
+@if $busuanzi_post_views {
   #busuanzi_container_page_pv {
     display: inline-block;
   }

assets/css/_common/outline/footer/index.scss

@@ -98,17 +98,15 @@
   }
 }
 
-@if $busuanzi_enable {
-  .busuanzi-count {
-    @if $busuanzi_visitors {
-      #busuanzi_container_site_uv {
-        display: none;
-      }
+.busuanzi-count {
+  @if $busuanzi_visitors {
+    #busuanzi_container_site_uv {
+      display: none;
     }
-    @if $busuanzi_views {
-      #busuanzi_container_site_pv {
-        display: none;
-      }
+  }
+  @if $busuanzi_views {
+    #busuanzi_container_site_pv {
+      display: none;
     }
   }
 }

assets/css/main.scss

@@ -34,7 +34,6 @@ $footer_vendors_enable      : {{ isset $P.footer "vendors" }};
 {{ end }}
 
 // Counter
-$busuanzi_enable            : {{ $P.busuanzi.enable }};
 $busuanzi_visitors          : {{ $P.busuanzi.visitors }};
 $busuanzi_views             : {{ $P.busuanzi.views }};
 $busuanzi_post_views        : {{ $P.busuanzi.postViews }};

exampleSite/config.yaml

@@ -753,6 +753,7 @@ params:
   # Waline comments system
   # More info seee: https://waline.js.org/
   waline:
+    pageView: true
     placeholder: "请文明发言"
     emoji: false
     imgUploader: false
@@ -859,12 +860,11 @@ params:
   # Show Views / Visitors of the website / page with busuanzi.
   # For more information: http://ibruce.info/2015/04/04/busuanzi/
   busuanzi:
-    enable: true
-    visitors: true
+    visitors: false
     visitorsIcon: fa fa-user
-    views: true
+    views: false
     viewsIcon: fa fa-eye
-    postViews: true
+    postViews: false
     postViewsIcon: far fa-eye
 
 
@@ -968,7 +968,7 @@ params:
   # Use Animate.css to animate everything.
   # For more information: https://animate.style
   motion:
-    enable: false
+    enable: true
     async: true
     transition:
       # All available transition variants: https://theme-next.js.org/animate/

layouts/partials/_thirdparty/comment/giscus.html

@@ -1,5 +1,4 @@
 {{- with .Site.Params.giscus }}
-{{ printf "%t" (isset . "repo") }}
 <div class="giscus" style="position: relative;"></div>
 <script src="https://giscus.app/client.js"
         data-repo="{{ .repo }}"

layouts/partials/post/header_meta/views.html

@@ -2,10 +2,10 @@
 {{- if .Site.Params.leancloudVisitors.enable }}
 {{- $pageViewCls = "leancloud-visitors-count" }}  
 {{- end }}
-{{- if and .Site.Params.waline.enable .Site.Params.waline.pageView }}
+{{- if .Site.Params.waline.pageView }}
 {{- $pageViewCls = "waline-pageview-count" }}
 {{- end }}
-{{- if and .Site.Params.busuanzi.enable .Site.Params.busuanzi.postViews }}
+{{- if .Site.Params.busuanzi.postViews }}
 {{- $pageViewCls = "busuanzi_value_page_pv" }}
 {{- end }}
 <span class="post-meta-item" title="{{ T "PostViews" }}">