Merge branch 'jerryc127:dev' into dev

layout/includes/additional-js.pug

@@ -52,10 +52,10 @@ div
     != partial("includes/third-party/umami_analytics", {}, { cache: true })
 
   if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-    script(async data-pjax src=url_for(theme.asset.busuanzi) || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
+    script(async data-pjax src=theme.asset.busuanzi ? url_for(theme.asset.busuanzi) : '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
 
   != partial('includes/third-party/search/index', {}, { cache: true })
 
   if theme.google_tag_manager && theme.google_tag_manager.tag_id
     noscript
-      iframe(src=`${theme.google_tag_manager.domain ? theme.google_tag_manager.domain : 'https://www.googletagmanager.com'}/ns.html?id=${theme.google_tag_manager.tag_id}` height="0" width="0" style="display:none;visibility:hidden")
+      iframe(src=`${theme.google_tag_manager.domain ? theme.google_tag_manager.domain : 'https://www.googletagmanager.com'}/ns.html?id=${theme.google_tag_manager.tag_id}` height="0" width="0" style="display:none;visibility:hidden")

layout/includes/third-party/umami_analytics.pug

@@ -62,8 +62,8 @@ script.
           const pagePV = document.getElementById('umamiPV')
           if (pagePV) {
             const data = await getData(true)
-            if (data && data.pageviews && typeof data.pageviews.value !== 'undefined') {
-              pagePV.textContent = data.pageviews.value
+            if (data && data.pageviews) {
+              pagePV.textContent = typeof data.pageviews.value !== 'undefined' ? data.pageviews.value : data.pageviews
             } else {
               console.warn('Umami Analytics: Invalid page view data received')
             }
@@ -75,8 +75,8 @@ script.
 
           if (config.site_uv) {
             const siteUV = document.getElementById('umami-site-uv')
-            if (siteUV && data && data.visitors && typeof data.visitors.value !== 'undefined') {
-              siteUV.textContent = data.visitors.value
+            if (siteUV && data && data.visitors) {
+              siteUV.textContent = typeof data.visitors.value !== 'undefined' ? data.visitors.value : data.visitors
             } else if (siteUV) {
               console.warn('Umami Analytics: Invalid site UV data received')
             }
@@ -84,8 +84,8 @@ script.
 
           if (config.site_pv) {
             const sitePV = document.getElementById('umami-site-pv')
-            if (sitePV && data && data.pageviews && typeof data.pageviews.value !== 'undefined') {
-              sitePV.textContent = data.pageviews.value
+            if (sitePV && data && data.pageviews) {
+              sitePV.textContent = typeof data.pageviews.value !== 'undefined' ? data.pageviews.value : data.pageviews
             } else if (sitePV) {
               console.warn('Umami Analytics: Invalid site PV data received')
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "5.5.2",
+  "version": "5.5.3-b1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

source/css/_highlight/highlight.styl

@@ -113,6 +113,10 @@ $code-block
       margin: 2px
 
     i
+      display: inline-flex
+      justify-content: center
+      align-items: center
+      padding: 5px
       cursor: pointer
       transition: all .3s
 
@@ -128,7 +132,7 @@ $code-block
 
     if !$highlight_macstyle
       & > .macStyle
-        padding: 0
+        margin: 0
 
     .code-lang
       flex: 1 1 auto
@@ -182,6 +186,7 @@ if $highlight_macstyle
       .highlight-tools
         .macStyle
           display: flex
+          padding: 3px
 
           & > *
             margin-right: 8px

source/js/main.js

@@ -84,10 +84,13 @@ document.addEventListener('DOMContentLoaded', () => {
         const buttonRect = ele.getBoundingClientRect()
         const scrollTop = window.pageYOffset || document.documentElement.scrollTop
         const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft
-        const finalTop = buttonRect.top + scrollTop - 40
         const finalLeft = buttonRect.left + scrollLeft + buttonRect.width / 2
 
-        const topValue = ele.closest('figure.highlight').classList.contains('code-fullpage') ? finalTop + 60 : finalTop
+        // Show tooltip below button if too close to top
+        const normalTop = buttonRect.top + scrollTop - 40
+        const shouldShowBelow = buttonRect.top < 60 || normalTop < 10
+
+        const topValue = shouldShowBelow ? buttonRect.top + scrollTop + buttonRect.height + 10 : normalTop
 
         newEle.style.cssText = `
       top: ${topValue + 10}px;
@@ -111,6 +114,7 @@ document.addEventListener('DOMContentLoaded', () => {
         }, 800)
       }
     }
+
     const copy = async (text, ctx) => {
       try {
         await navigator.clipboard.writeText(text)