hexo-theme-solitude 1.6.0 → 1.6.1

package/source/css/_layout/sidebar.styl

@@ -22,7 +22,6 @@
     height 100%
     background var(--efu-maskbgdeep)
     transition all .5s ease 0s
-    padding-top 30px
     z-index 1001
     border-left var(--style-border-always)
 
@@ -48,6 +47,33 @@
           .site-page span:hover
             color var(--efu-white)
 
+    .site-data
+      display flex
+      width 100%
+      justify-content flex-start
+      margin 12px 0 0 0
+      padding .6rem 16px
+
+      .data-item
+        display flex
+        justify-content flex-start
+        margin-right 36px
+
+        .data-item-link > a
+          display flex
+          flex-direction column
+          align-items flex-start
+
+        .data-item-link .length-num
+          color var(--efu-fontcolor)
+          font-size 20px
+          font-weight 700
+          line-height 1
+
+        .data-item-link .headline
+          font-size 12px
+          color var(--efu-secondtext)
+
     .menus_items
       padding 0 16px
 
@@ -137,22 +163,6 @@
         &:hover
           transform rotate(360deg)
 
-    .site-data
-      display table
-      padding .6rem .5rem 0
-      width 100%
-      table-layout fixed
-
-      .data-item
-        display table-cell
-
-        .data-item-link .length-num
-          color var(--text-highlight-color)
-          font-size 1.28em
-
-        .data-item-link .headline
-          color var(--efu-fontcolor)
-
     hr
       margin 1rem auto
 
@@ -188,14 +198,14 @@
       padding 0 16px
       margin-bottom 6px
 
-      a.darkmode_switchbutton
+      span.darkmode_switchbutton
         padding 4px 8px
 
         [data-theme="dark"] &
           background var(--efu-orange)
           color var(--efu-white)
 
-      a.menu-child
+      span.menu-child
         width 100%
         background var(--efu-card-bg)
         border-radius 8px
@@ -211,7 +221,7 @@
           align-items center
           justify-content center
 
-      a.menu-child span
+      span.menu-child span
         margin-left 10px
 
     .webinfo

package/source/css/_page/_home/home-top.styl

@@ -334,7 +334,7 @@
   border-radius 60px
   margin-bottom 12px
   color var(--efu-white)
-  width 94px
+  width 100px
   position relative
   background-size 200%
 

package/source/css/_page/_home/recent-post.styl

@@ -118,7 +118,7 @@ if hexo-config('index_post_list.direction') == "column"
           overflow hidden
           -webkit-box-orient vertical
           padding 5px 32px
-          color var(--efu-gray)
+          opacity .8
           font-size 14px
           line-height 1.8
 
@@ -338,7 +338,7 @@ else if hexo-config('index_post_list.direction') == "row"
           overflow hidden
           -webkit-box-orient vertical
           padding 5px 32px
-          color var(--efu-gray)
+          opacity .8
           font-size 14px
           line-height 1.8
           +maxWidth768()

package/source/css/_page/links.styl

@@ -28,7 +28,7 @@
       top 0
       width 100px
       height 50px
-      background-image -webkit-linear-gradient(0deg,rgba(255,255,255,0),rgba(255,255,255,.5),rgba(255,255,255,0))
+      background-image -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, .5), rgba(255, 255, 255, 0))
       animation light_tag 4s both infinite
 
     &.vip
@@ -73,7 +73,6 @@
         width calc(50% - 16px)
 
       .img
-        -webkit-mask-image -webkit-radial-gradient(center, #fff, #000)
         border-radius 0
         height 120px
         width 100%
@@ -81,7 +80,6 @@
         border none
         padding 0
         transition all .3s ease 0s
-        background #f6f6f6
         overflow hidden
 
         img
@@ -114,6 +112,7 @@
           height 20px
           min-width 20px
           min-height 20px
+          transform scale(1.1)
           background var(--efu-secondbg)
 
         .site-card-text
@@ -147,15 +146,17 @@
       &:hover
         border var(--style-border-hover)
         box-shadow var(--efu-shadow-main)
+        background var(--efu-main)
 
         .site-card-tag
           left: -60px
 
         .img
-          transform scale(1.1)
+          transform scale(1)
           filter brightness(.3)
           border-radius 12px
           background var(--efu-lighttext)
+          background var(--efu-main)
           +minWidth768()
             height 80px
 
@@ -191,7 +192,6 @@
     padding 0
     margin 0.5rem -6px 1rem -6px
     overflow-x hidden
-    overflow auto
     text-align center
 
     &.mini

package/source/css/_post/content.styl

@@ -62,6 +62,19 @@
 
     img
       margin auto
+    a
+      &:not(.fancybox)
+        text-decoration none
+        border-bottom 2px dotted var(--efu-lighttext)
+        color var(--efu-fontcolor)
+        font-weight 700
+        padding 0 4px
+        border-radius 4px 4px 0 0
+
+        &:hover
+          color var(--efu-white)
+          border-radius 4px
+          background var(--efu-main)
 
   code:not([class*='language-'])
     color var(--efu-white)

package/source/css/_post/tools.styl

@@ -108,6 +108,7 @@
             .reward-title
               font-weight 700
               color var(--efu-red)
+              text-wrap wrap
 
             .reward-group
               display flex
@@ -119,14 +120,6 @@
                 list-style-type none
                 vertical-align top
 
-                &:first-child
-                  img
-                    border-color var(--efu-green)
-
-                &:last-child
-                  img
-                    border-color var(--efu-blue)
-
                 img
                   width 130px
                   height 130px
@@ -156,7 +149,7 @@
               &:hover
                 color var(--efu-white)
                 background var(--efu-red)
-                background-image url(https://bu.dusays.com/2023/11/01/6541f7aeb5752.gif)
+                background-image url(/img/flower.gif)
                 box-shadow var(--efu-shadow-red)
 
               .reward-text
@@ -165,6 +158,7 @@
 
               .reward-dec
                 font-size .6rem
+                text-wrap wrap
 
       // rss
 

package/source/js/{comment/twikoo_commentBarrage.js → commentBarrage/twikoo.js}

@@ -102,15 +102,9 @@ function initializeCommentBarrage() {
             const commentBarrageSwitch = localStorage.getItem("commentBarrageSwitch");
             if (commentBarrageSwitch != null) {
                 document.querySelector(".comment-barrage").style.display = "flex";
-                if (GLOBAL_CONFIG.rightside.enable) {
-                    document.querySelector(".menu-commentBarrage-text").textContent = "关闭热评";
-                }
                 document.querySelector("#consoleCommentBarrage").classList.add("on");
             } else {
                 document.querySelector(".comment-barrage").style.display = "none";
-                if (GLOBAL_CONFIG.rightside.enable) {
-                    document.querySelector(".menu-commentBarrage-text").textContent = "显示热评";
-                }
                 document.querySelector("#consoleCommentBarrage").classList.remove("on");
             }
             const comments = await this.fetchComments();

package/source/js/{comment/waline_commentBarrage.js → commentBarrage/waline.js}

@@ -108,11 +108,9 @@ function initializeCommentBarrage() {
 
             if (localStorage.getItem("commentBarrageSwitch") != null) {
                 commentBarrage.style.display = "flex";
-                GLOBAL_CONFIG.rightside.enable && (menuCommentBarrageText.textContent = "关闭热评");
                 consoleCommentBarrage.classList.add("on");
             } else {
                 commentBarrage.style.display = "none";
-                GLOBAL_CONFIG.rightside.enable && (menuCommentBarrageText.textContent = "显示热评");
                 consoleCommentBarrage.classList.remove("on");
             }
 

package/source/js/main.js

@@ -234,17 +234,29 @@ let sco = {
             }));
         }
     },
+    musicToggle: function () {
+        const $music = document.querySelector('#nav-music');
+        const $meting = document.querySelector('meting-js');
+        const $console = document.getElementById('consoleMusic');
+        const $toggleButton = document.getElementById('menu-music-toggle');
+        wleelw_musicPlaying = !wleelw_musicPlaying;
+        $music.classList.toggle("playing", wleelw_musicPlaying);
+        $console.classList.toggle("on", wleelw_musicPlaying);
+        if (wleelw_musicPlaying) {
+            $meting.aplayer.play();
+        } else {
+            $meting.aplayer.pause();
+        }
+    },
     switchCommentBarrage: function () {
         let commentBarrageElement = document.querySelector(".comment-barrage");
         if (commentBarrageElement) {
             if (window.getComputedStyle(commentBarrageElement).display === "flex") {
                 commentBarrageElement.style.display = "none";
-                document.querySelector(".menu-commentBarrage-text").textContent = "显示热评";
                 document.querySelector("#consoleCommentBarrage").classList.remove("on");
                 localStorage.removeItem("commentBarrageSwitch");
             } else {
                 commentBarrageElement.style.display = "flex";
-                document.querySelector(".menu-commentBarrage-text").textContent = "关闭热评";
                 document.querySelector("#consoleCommentBarrage").classList.add("on");
                 localStorage.setItem("commentBarrageSwitch", "false");
             }
@@ -290,12 +302,10 @@ let sco = {
             document.documentElement.setAttribute('data-theme', 'dark')
             saveToLocal.set('theme', 'dark', 0.02);
             utils.snackbarShow(GLOBAL_CONFIG.lang.theme.dark, false, 2000)
-            GLOBAL_CONFIG.rightside && (document.querySelector(".menu-darkmode-text").textContent = "浅色模式");
         } else {
             document.documentElement.setAttribute('data-theme', 'light')
             saveToLocal.set('theme', 'light', 0.02);
             utils.snackbarShow(GLOBAL_CONFIG.lang.theme.light, false, 2000)
-            GLOBAL_CONFIG.rightside && (document.querySelector(".menu-darkmode-text").textContent = "深色模式");
         }
     },
     hideTodayCard: () => document.getElementById('todayCard').classList.add('hide'),
@@ -368,67 +378,6 @@ let sco = {
             }
         });
     },
-    downloadImage: function (imageUrl, filename = 'photo') {
-        if (rm.downloadimging) {
-            utils.snackbarShow("有正在进行中的下载，请稍后再试");
-            return;
-        }
-
-        rm.hideRightMenu();
-        rm.downloadimging = true;
-        utils.snackbarShow("正在下载中，请稍后", false, 10000);
-
-        let img = new Image();
-        img.setAttribute("crossOrigin", "anonymous");
-        img.onload = function () {
-            let canvas = document.createElement("canvas");
-            canvas.width = img.width;
-            canvas.height = img.height;
-            let ctx = canvas.getContext("2d");
-            ctx.drawImage(img, 0, 0, img.width, img.height);
-
-            let dataUrl = canvas.toDataURL("image/png");
-            let link = document.createElement("a");
-            link.download = filename;
-            link.href = dataUrl;
-
-            let clickEvent = new MouseEvent("click");
-            link.dispatchEvent(clickEvent);
-
-            utils.snackbarShow("图片已添加盲水印，请遵守版权协议");
-            rm.downloadimging = false;
-        };
-        img.src = imageUrl;
-    },
-    musicToggle: function () {
-        const $music = document.querySelector('#nav-music');
-        const $meting = document.querySelector('meting-js');
-        const $console = document.getElementById('consoleMusic');
-        const $toggleButton = document.getElementById('menu-music-toggle');
-        wleelw_musicPlaying = !wleelw_musicPlaying;
-        $music.classList.toggle("playing", wleelw_musicPlaying);
-        $console.classList.toggle("on", wleelw_musicPlaying);
-        if (wleelw_musicPlaying) {
-            $meting.aplayer.play();
-            $toggleButton.innerHTML = `<i class="solitude st-pause-fill"></i><span>暂停音乐</span>`;
-        } else {
-            $meting.aplayer.pause();
-            $toggleButton.innerHTML = `<i class="solitude st-play-fill"></i><span>播放音乐</span>`;
-        }
-        rm.hideRightMenu();
-    },
-    musicSkipBack: function () {
-        document.querySelector('meting-js').aplayer.skipBack()
-        rm.hideRightMenu()
-    },
-    musicSkipForward: function () {
-        document.querySelector('meting-js').aplayer.skipForward()
-        rm.hideRightMenu()
-    },
-    musicGetName: function () {
-        const titles = Array.from(document.querySelectorAll('.aplayer-title')).map(e => e.innerText);
-        return titles[0];
-    },
     scrollToComment: function () {
         utils.scrollToDest(utils.getEleTop(document.getElementById('post-comment')), 300)
     },
@@ -581,13 +530,13 @@ let sco = {
         });
     },
     addNavBackgroundInit: function () {
-        var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
+        const scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
         if (scrollTop !== 0) {
-            var pageHeader = document.getElementById("page-header");
+            const pageHeader = document.getElementById("page-header");
             if (pageHeader) {
                 pageHeader.classList.add("nav-fixed", "nav-visible");
             }
-            var cookiesWindow = document.getElementById("cookies-window");
+            const cookiesWindow = document.getElementById("cookies-window");
             if (cookiesWindow) {
                 cookiesWindow.style.display = 'none';
             }
@@ -656,9 +605,63 @@ let sco = {
             element.dispatchEvent(new Event("input"));
         });
     },
+    owoBig() {
+        const type = GLOBAL_CONFIG.comment.type;
+        const owoSelectors = {
+            body: type === 'twikoo' ? '.OwO-body' : '.wl-emoji-popup',
+            item: type === 'twikoo' ? '.OwO-items li' : '.wl-tab-wrapper button'
+        };
+
+        let owoBig = document.getElementById('owo-big');
+        if (!owoBig) {
+            owoBig = document.createElement('div');
+            owoBig.id = 'owo-big';
+            document.body.appendChild(owoBig);
+        }
+
+        const debounce = (func, wait) => {
+            let timeout;
+            return function (...args) {
+                const later = () => {
+                    clearTimeout(timeout);
+                    func(...args);
+                };
+                clearTimeout(timeout);
+                timeout = setTimeout(later, wait);
+            };
+        };
+
+        const showOwoBig = (event) => {
+            const target = event.target;
+            const owoItem = target.closest(owoSelectors.item);
+            if (owoItem && target.closest(owoSelectors.body)) {
+                const imgSrc = owoItem.querySelector('img')?.src;
+                if (imgSrc) {
+                    owoBig.innerHTML = `<img src="${imgSrc}" style="max-width: 100%; height: auto;">`;
+                    owoBig.style.display = 'block';
+                    positionOwoBig(owoItem);
+                }
+            }
+        };
+
+        const hideOwoBig = (event) => {
+            if (event.target.closest(owoSelectors.item) && event.target.closest(owoSelectors.body)) {
+                owoBig.style.display = 'none';
+            }
+        };
+
+        function positionOwoBig(owoItem) {
+            const itemRect = owoItem.getBoundingClientRect();
+            owoBig.style.left = `${itemRect.left - (owoBig.offsetWidth / 4)}px`;
+            owoBig.style.top = `${itemRect.top}px`;
+        }
+
+        document.addEventListener('mouseover', debounce(showOwoBig, 100));
+        document.addEventListener('mouseout', hideOwoBig);
+    }
 }
 
-const AddHighLightTool = () => {
+const addHighlight = () => {
     const highlight = GLOBAL_CONFIG.highlight;
     if (!highlight) return;
 
@@ -810,13 +813,12 @@ window.refreshFn = () => {
     sco.listenToPageInputPress()
     sco.addNavBackgroundInit()
     utils.changeTimeFormat()
-    GLOBAL_CONFIG.rightside.enable && addRightMenuClickEvent()
     GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg()
     GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar)"))
     GLOBAL_CONFIG.randomlinks && randomLinksList()
     PAGE_CONFIG.comment && initComment()
     PAGE_CONFIG.toc && toc.init();
-    (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((AddHighLightTool()) || tabs.init())
+    (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((addHighlight()) || tabs.init())
     PAGE_CONFIG.is_home && showTodayCard()
     GLOBAL_CONFIG.covercolor.enable && coverColor()
     sco.initConsoleState()
@@ -824,7 +826,6 @@ window.refreshFn = () => {
     document.body.setAttribute('data-type', PAGE_CONFIG.page)
     PAGE_CONFIG.page === "music" && scoMusic.init()
     GLOBAL_CONFIG.ai.enable && PAGE_CONFIG.page === "post" && ScoAI.init()
-    preloader.removePaceDone()
 }
 
 document.addEventListener('DOMContentLoaded', function () {

package/source/js/utils.js

@@ -224,7 +224,7 @@ const utils = {
             }
         }
     },
-    changeTimeFormat(){
+    changeTimeFormat() {
         window.Lately && Lately.init({
             target: 'time',
             lang: GLOBAL_CONFIG.lang.lately,

package/layout/includes/widgets/rightside/index.pug

@@ -1,87 +0,0 @@
-div#rightMenu
-    div.rightMenu-group.rightMenu-small
-        div.rightMenu-item#menu-backward
-            i.solitude.st-arrow-left-line
-        div.rightMenu-item#menu-forward
-            i.solitude.st-arrow-right-line
-        div.rightMenu-item#menu-refresh
-            i.solitude.st-restart-line
-        div.rightMenu-item#menu-top
-            i.solitude.st-arrow-up-line
-    div.rightMenu-group.rightMenu-line.rightMenuPlugin
-        div.rightMenu-item#menu-copytext
-            i.solitude.st-copy-fill
-            span= _p('rightmenu.copytext')
-        div.rightMenu-item#menu-pastetext
-            i.solitude.st-clipboard-fill
-            span= _p('rightmenu.pastetext')
-        if theme.comment.enable
-            a.rightMenu-item#menu-commenttext
-                i.solitude.st-chat-new-fill
-                span= _p('rightmenu.commenttext')
-        div.rightMenu-item#menu-newwindow
-            i.solitude.st-window-fill
-            span= _p('rightmenu.newwindow')
-        div.rightMenu-item#menu-copylink
-            i.solitude.st-link-line
-            span= _p('rightmenu.copylink')
-        div.rightMenu-item#menu-copyimg
-            i.solitude.st-copy-fill
-            span= _p('rightmenu.copyimg')
-        div.rightMenu-item#menu-downloadimg
-            i.solitude.st-download-cloud-fill
-            span= _p('rightmenu.downloadimg')
-        div.rightMenu-item#menu-search
-            i.solitude.st-search-line
-            span= _p('rightmenu.search')
-        div.rightMenu-item#menu-music-toggle
-            i.solitude.st-play-fill
-            span= _p('rightmenu.music.toggle')
-        div.rightMenu-item#menu-music-back
-            i.solitude.st-skip-back-fill
-            span= _p('rightmenu.music.back')
-        div.rightMenu-item#menu-music-forward
-            i.solitude.st-skip-forward-fill
-            span= _p('rightmenu.music.forward')
-        div.rightMenu-item#menu-music-playlist(onclick=`window.open('${theme.capsule.server === 'tencent' ? `https://y.qq.com/n/ryqq/playlist/${theme.capsule.id}` : `https://music.163.com/#/playlist?id=${theme.capsule.id}`}', '_blank');`)
-            i.solitude.st-play-list-2-line
-            span= _p('rightmenu.music.playlist')
-        div.rightMenu-item#menu-music-copyMusicName
-            i.solitude.st-copy-fill
-            span= _p('rightmenu.music.copyMusicName')
-    div.rightMenu-group.rightMenu-line.rightMenuOther
-        a.rightMenu-item.menu-Link#menu-randomPost
-            i.solitude.st-signal-tower-fill
-            span= _p('rightmenu.randomPost')
-        a.rightMenu-item.menu-link(href="/categories/")
-            i.solitude.st-checkbox-multiple-blank-fill
-            span= _p('rightmenu.categories')
-        a.rightMenu-item.menu-link(href="/tags/")
-            i.solitude.st-price-tag-fill
-            span= _p('rightmenu.tags')
-    div.rightMenu-group.rightMenu-line.rightMenuOther
-        div.rightMenu-item#menu-copy
-            i.solitude.st-external-link-fill
-            span= _p('rightmenu.copyaddress')
-        if  theme.comment.enable && theme.comment.commentBarrage
-            div.rightMenu-item#menu-commentBarrage
-                i.solitude.st-chat-fill
-                span.menu-commentBarrage-text= _p('rightmenu.commentBarrage')
-        div.rightMenu-item#menu-darkmode
-            i.solitude.st-moon-clear-fill
-            case theme.display_mode.type
-                when 'auto'
-                when 'light'
-                    span.menu-darkmode-text= _p('rightmenu.dark')
-                when 'dark'
-                    span.menu-darkmode-text= _p('rightmenu.light')
-        if theme.translate.enable
-            div.rightMenu-item#menu-translate
-                case theme.translate.defaultEncoding
-                    when 2
-                        i.solitude.st-panben-line
-                        span= _p('rightmenu.chs_to_cht')
-                    when 1
-                        i.solitude.st-jianben-line
-                        span= _p('rightmenu.cht_to_chs')
-div#rightmenu-mask