hexo-theme-solitude 2.0.12-rc.1 → 2.0.13

package/README.md

@@ -43,7 +43,6 @@ English丨[简体中文](README_zh-Hans.md)丨[繁体中文](README_zh-Hant.md)
 ## Todo
 
 - [x] The list of articles is displayed in three columns on the homepage.
-- [x] btns tags plugin.
 
 > If you have any questions, please issue an [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 
@@ -81,4 +80,6 @@ Check out the [Documentation](https://solitude.js.org/) for more information.
 
 ## License
 
-[MIT](./LICENSE) License © 2023-PRESENT [Ever Fu](https://github.com/everfu)
+[MIT](./LICENSE) License © 2023-PRESENT [一小只托尼](https://github.com/everfu)
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude?ref=badge_large)

package/README_zh-Hans.md

@@ -43,8 +43,6 @@
 ## Todo
 
 - [x] 首页顶部新样式
-- [x] 首页文章列表三列显示
-- [x] btns 外挂标签
 
 > 如有问题请提 [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 
@@ -82,6 +80,6 @@
 
 ## 版权
 
-[MIT](./LICENSE) License © 2023-至今 [EverFu](https://github.com/efuo)
+[MIT](./LICENSE) License © 2023-至今 [一小只托尼](https://github.com/efuo)
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude?ref=badge_large)

package/README_zh-Hant.md

@@ -43,7 +43,6 @@
 ## Todo
 
 - [x] 首页文章列表三列显示
-- [x] btns 外挂标签
 
 ## 應用
 
@@ -79,4 +78,6 @@
 
 ## 版權
 
-[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/everfu)
+[MIT](./LICENSE) License © 2023-至今 [一小只托尼](https://github.com/everfu)
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude?ref=badge_large)

package/_config.yml

@@ -487,7 +487,7 @@ envelope:
 # can only use NetEase Cloud Music, QQ Music and other music platforms supported by the mainland China region,
 # the subsequent consideration of the use of JSON files to store music information and customize the implementation of the third-party API does not depend on the page.
 # Music Page
-meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r" # Custom API
+meting_api: "https://meting.everfu.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r" # Custom API
 music:
   enable: false
   # 歌单 ID / 单曲 ID
@@ -882,6 +882,9 @@ right_menu:
   # Whether to display the hot comment switch.
   # 是否显示热门评论开关
   commentBarrage: false
+  # Whether to display the browser's context menu when hold Ctrl key.
+  # 是否在按住 Ctrl 键时显示浏览器右键菜单
+  ctrlOriginalMenu: false
   # Simplified and Traditional Chinese translation.
   # 简繁体转换
   translate:

package/languages/default.yml

@@ -140,6 +140,7 @@ console:
 sidebar:
   function: Function
   darkmode: Display mode
+  siteinfo: Site information
 
 footer:
   description: Article from ${title}
@@ -195,6 +196,7 @@ right_menu:
   chs_to_cht: 轉為繁體
   cht_to_chs: 转为简体
   img_error: This image cannot be copied or downloaded.
+  ctrl_original_menu: Hold Ctrl + right-click to open the browser's context menu
   barrage:
     open: Open Barrage
     close: Close Barrage
@@ -219,7 +221,6 @@ about:
     tj:
       tip: Data
       title: Access statistics
-      post_tip: 'Stats from:'
   personalities:
     tip1: At
     tip2: 'Learn more:'

package/languages/en.yml

@@ -140,6 +140,7 @@ console:
 sidebar:
   function: Function
   darkmode: Display mode
+  siteinfo: Site information
 
 footer:
   description: Article from ${title}
@@ -195,6 +196,7 @@ right_menu:
   chs_to_cht: 轉為繁體
   cht_to_chs: 转为简体
   img_error: This image cannot be copied or downloaded.
+  ctrl_original_menu: Hold Ctrl + right-click to open the browser's context menu
   barrage:
     open: Open Barrage
     close: Close Barrage

package/languages/zh-CN.yml

@@ -140,6 +140,7 @@ console:
 sidebar:
   function: 功能
   darkmode: 显示模式
+  siteinfo: 网站信息
 
 footer:
   description: 来自${title}的文章
@@ -195,6 +196,7 @@ right_menu:
   chs_to_cht: 轉為繁體
   cht_to_chs: 转为简体
   img_error: 此图片无法复制与下载
+  ctrl_original_menu: 按住Ctrl+右键可打开浏览器右键菜单
   barrage:
     open: 显示热评
     close: 关闭热评
@@ -219,7 +221,6 @@ about:
     tj:
       tip: 数据
       title: 访问统计
-      post_tip: 统计信息来自
   personalities:
     tip1: 在
     tip2: 了解更多关于

package/languages/zh-TW.yml

@@ -1,6 +1,6 @@
 more: 更多
 star: 喜歡這篇的人也看了
-random: 随便逛逛
+random: 隨便逛逛
 upload: 發佈時間：
 totalk: 無需刪除空行，直接輸入評論即可
 loading: 加載中...
@@ -18,9 +18,9 @@ copy:
 
 copy_copyright:
   author: 作者
-  link: 連結
+  link: 鏈結
   source: 來源
-  info: 著作權歸作者所有。 商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
 
 time:
   day: "天前"
@@ -41,16 +41,16 @@ nav:
   site_name_title: 返回博客主頁
   backtop: 返回頂部
   travellings: 開往-友鏈接力
-  search: 搜索
+  search: 搜尋
   randompost: 隨機一篇文章
-  console: 中控台
+  console: 主控台
 
 home:
   home: 推薦
   sticky: 置頂
   new: 最新
   read: 未讀
-  recommend: 荐
+  recommend: 薦
   recommendmore: 更多推薦
   archives: 全部文章
 
@@ -66,9 +66,9 @@ post:
   pv: 文章熱度
   comment: 評論數
   copyright:
-    reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
-    original: 本文是原创文章，采用
-    original_end: 协议，完整转载请注明来自
+    reprint: 本文是轉載或翻譯文章，版權歸原作者所有。轉載本文請聯繫原作者。
+    original: 本文是原創文章，採用
+    original_end: 協議，完整轉載請註明來自
   share:
     qq: 分享到QQ
     weibo: 分享到微博
@@ -76,8 +76,8 @@ post:
     twitter: 分享到Twitter
     linkedin: 分享到LinkedIn
     facebook: 分享到Facebook
-    link: 复制文章链接
-    qrcode: 使用手机扫码阅读这篇文章
+    link: 複製文章鏈接
+    qrcode: 使用手機掃碼閱讀這篇文章
     whatsapp: 分享到WhatsApp
   ai:
     title: 文章摘要
@@ -109,12 +109,12 @@ aside:
   wordcount: '字數統計：'
   toc: 文章目錄
   tagmore: 查看全部
-  avatar: 头像
+  avatar: 頭像
   hello: 好久不見，
   back: 歡迎再次回來，
-  sticker: 心情贴纸
-  newpost: 最近发布
-  newcomment: 最新评论
+  sticker: 心情貼紙
+  newpost: 最近發佈
+  newcomment: 最新評論
   card:
     posts: '累計文章數:'
     tags: '標籤總數:'
@@ -124,22 +124,23 @@ console:
   comment_tip: 互動
   comment_title: 評論
   tag_tip: 標籤
-  tag_title: 標籤
-  switch_darkmode: 昼夜切換
-  switch_hideAside: 边栏显示控制
+  tag_title: 尋找感興趣的領域
+  switch_darkmode: 晝夜切換
+  switch_hideAside: 側邊欄顯示控制
   switch_keyboard: 鍵盤快捷鍵
   switch_music: 音樂開關
   archive_unit: 篇
   recent_comment_more: 最近評論
   newest_comment:
     image: 圖片
-    link: 連結
+    link: 鏈結
     code: 代碼
     emoji: 表情
 
 sidebar:
   function: 功能
   darkmode: 顯示模式
+  siteinfo: 網站信息
 
 footer:
   description: 來自${title}的文章
@@ -181,10 +182,10 @@ f12: 開發者模式已打開，請遵循GPL協定。
 
 right_menu:
   copy: 複製選中文本
-  paste: 粘貼文本
+  paste: 貼上文本
   comment: 引用到評論
   new: 新窗口打開
-  link: 複製連結位址
+  link: 複製鏈結位址
   img: 複製此圖片
   downloadImg: 下載此圖片
   search: 站內搜索
@@ -193,6 +194,7 @@ right_menu:
   chs_to_cht: 轉為繁體
   cht_to_chs: 转为简体
   img_error: 此圖片無法複製與下載
+  ctrl_original_menu: 按住Ctrl+右鍵可打開瀏覽器右鍵選單
   barrage:
     open: 顯示熱評
     close: 關閉熱評
@@ -229,4 +231,4 @@ message:
 essay:
   tip0: '- 已展開所有短文 -'
   tip1: '- 只展示最近 #{count} 條短文 -'
-  link: '連接'
+  link: '鏈結'

package/layout/includes/head/config.pug

@@ -120,6 +120,8 @@
                 defaultEncoding: theme.right_menu.translate.defaultEncoding
             }
         }
+        if (theme.right_menu.ctrlOriginalMenu)
+            rightMenu.ctrlOriginalMenu = _p('right_menu.ctrl_original_menu')
     }
 
     let highlight = false

package/layout/includes/head/page_config.pug

@@ -6,5 +6,6 @@ script#config-diff.
         page: '!{page.type}',
         toc: !{!!page.toc},
         comment: !{!!page.comment},
-        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false}
+        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false},
+        color: !{page.color ? "'"+ page.color+"'" : false},
     }

package/layout/includes/inject/body.pug

@@ -121,8 +121,5 @@ if theme.footer.randomlink
 // pjax
 != partial("includes/widgets/third-party/pjax", {}, {cache: true})
 
-// theme
-include ../body/mode
-
 // google adsense
 include ../body/gadsense

package/layout/includes/inject/head.pug

@@ -48,3 +48,9 @@ if theme.extends.head
         != item
 
 !=fragment_cache('injectHeadJs', function(){return inject_head_js()})
+
+// theme
+include ../head/mode
+
+if theme.page.echart
+    script(src=url_for(theme.cdn.echarts))

package/layout/includes/page/says.pug

@@ -38,11 +38,11 @@ if theme.says.enable
                             .bber-bottom
                                 .bber-info
                                     .bber-info-time
-                                        i.solitude.fa-solid.fa-calendar-days
+                                        i.solitude.fa-solid.fa-calendar-day
                                         time.datetime(datetime=moment(item.date).format())
                                     if item.location
                                         .bber-info-location
-                                            i.solitude.fa-solid.fa-map
+                                            i.solitude.fas.fa-location-dot
                                             = item.location
                                     if item.link
                                         a.bber-content-link(href=url_for(item.link) target="_blank")

package/layout/includes/rightmenu.pug

@@ -7,7 +7,7 @@ div#rightMenu
         div.rightMenu-item#menu-forward
             i.solitude.fa-solid.fa-arrow-right
         div.rightMenu-item#menu-refresh
-            i.solitude.fa-solid.fa-arrow-rotate-right
+            i.solitude.fa-solid.fa-arrows-rotate
         div.rightMenu-item#menu-top
             i.solitude.fa-solid.fa-arrow-up
     div.rightMenu-group.rightMenu-line.rightMenuPlugin

package/layout/includes/sidebar.pug

@@ -29,4 +29,13 @@ div#sidebar(style="zoom: 1;")
             div.card-tag-cloud
                 each tag in site.tags.find({ parent: { $exists: false } }).data
                     a(href=url_for(tag.path))= tag.name
-                        sup= tag.length
+                        sup= tag.length
+        if theme.wordcount && theme.aside.siteinfo.wordcount
+            span.sidebar-menu-item-title= __('sidebar.siteinfo')
+            .webinfo
+                .webinfo-item
+                    .webinfo-item-title
+                        i.item-icon.solitude.fa-solid.fa-file-word
+                        .item-name= __('aside.wordcount')
+                    .item-count= totalcount(site)
+

package/layout/includes/widgets/aside/asideNewestPost.pug

@@ -3,14 +3,11 @@
         i.solitude.fa-solid.fa-map
         span= _p('aside.newpost')
     .aside-list
-        - let index = 1
-        each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1)
-            if index <= 5
-                .aside-list-item
-                    a.thumbnail(href=url_for(post.path) title=post.title)
-                        img(alt=post.title src=url_for(post.cover))
-                    .content
-                        span.title(href=url_for(post.path) title=post.title)= post.title
-                        if post.categories.data[0]
-                            span.article-recent_post_categories(href=url_for(post.path))= post.categories.data[0].name
-                - index++
+        each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1).slice(0, 5)
+            a.aside-list-item(href=url_for(post.path) title=post.title)
+                .thumbnail
+                    img(alt=post.title src=url_for(post.cover))
+                .content
+                    span.title(href=url_for(post.path) title=post.title)= post.title
+                    if post.categories.data[0]
+                        span.article-recent_post_categories(href=url_for(post.path))= post.categories.data[0].name

package/layout/includes/widgets/aside/asideWebInfo.pug

@@ -31,13 +31,13 @@
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item
             .webinfo-item-title
-                i.item-icon.solitude.fa-solid.fa-calendar-days
+                i.item-icon.solitude.fa-solid.fa-calendar-day
                 .item-name= __('aside.runtime')
             .item-count#runtimeshow
     if theme.aside.siteinfo.updatetime
         .webinfo-item
             .webinfo-item-title
-                i.item-icon.solitude.fa-solid.fa-rotate-left
+                i.item-icon.solitude.fa-solid.fa-arrows-rotate
                 .item-name= __('aside.updatetime')
             time.item-count(datetime=new Date())
     if theme.wordcount && theme.aside.siteinfo.wordcount

package/layout/includes/widgets/page/about/other.pug

@@ -9,13 +9,7 @@ if tj || oneself
                     .author-content-item-tips=_p('about.other.tj.tip')
                     span.author-content-item-title=_p('about.other.tj.title')
                     #statistic
-                    .post-tips
-                        = _p('about.other.tj.post_tip')
-                        case tj.provider
-                            when '51la'
-                                a(href="https://v6.51.la/") 51la网站统计
-                            when 'baidu'
-                                a(href="https://tongji.baidu.com/") 百度统计
+                    .post-tips!= _p(tj.desc)
                     if tj.button
                         .banner-button-group
                             a.banner-button(href=url_for(tj.button_link))
@@ -42,7 +36,7 @@ if tj || oneself
                                     }
                                     s.innerHTML = html;
                                 });
-                    when 'baidu'
+                    when 'custom'
                         script.
                             fetch("#{tj.url}")
                                 .then(res => res.json())

package/layout/includes/widgets/page/links/banner.pug

@@ -16,7 +16,6 @@
     .tags-group-wrapper
         - const data = site.data.links.links
         - for (let i = 0; i < 2; i++)
-        each item in [1,2]
             each x in data
                     - var pairs = []
                     each y, index in x.link_list

package/layout/includes/widgets/post/postInfo.pug

@@ -18,11 +18,11 @@
         .meta-secondline
             if theme.post.meta.date
                 span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
-                    i.post-meta-icon.solitude.fa-solid.fa-calendar-days
+                    i.post-meta-icon.solitude.fa-solid.fa-clock
                     time(datetime=date_xml(page.date))= date_xml(page.date)
             if theme.post.meta.updated
                 span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated))
-                    i.post-meta-icon.solitude.fa-solid.fa-arrow-rotate-right
+                    i.post-meta-icon.solitude.fa-solid.fa-arrows-rotate
                     time(datetime=date_xml(page.updated))= date_xml(page.updated)
             if theme.wordcount
                 span.post-meta-wordcount
@@ -35,7 +35,7 @@
                         span= min2read(page.content) + " min"
             if theme.post.meta.locate
                 span.post-meta-position(title=_p('post.ip') + page.locate)
-                    i.post-meta-icon.solitude.fa-solid.fa-map
+                    i.post-meta-icon.solitude.fas.fa-location-dot
                     span= page.locate
             if theme.post.meta.pv
                 a.post-meta-pv(href=url_for(page.path), title=_p('post.pv'))

package/layout/page.pug

@@ -36,4 +36,4 @@ block content
                 - var comment_js = true
                 include includes/widgets/third-party/comments/comment
         if page.aside
-            include includes/widgets/aside/aside
+            include includes/widgets/aside/aside

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.12-rc.1",
+  "version": "2.0.13",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
   "scripts": {

package/scripts/event/merge_config.js

@@ -383,6 +383,7 @@ hexo.extend.filter.register('before_generate', () => {
     right_menu: {
       enable: false,
       commentBarrage: false,
+      ctrlOriginalMenu: false,
       translate: {
         enable: false,
         defaultEncoding: 2,

package/scripts/event/page.js

@@ -30,4 +30,4 @@ hexo.extend.generator.register('categories', function(locals) {
       comment: false
     }
   };
-});
+});

package/scripts/filter/checkThemeConfig.js

@@ -5,12 +5,12 @@ hexo.extend.filter.register('before_post_render', () => {
         const logger = hexo.log;
         const theme = hexo.theme.config;
         if (theme.says.enable && !data.essay) {
-            logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。');
+            logger.error('\n 启用即刻短文的情况下，请新建 essay.yaml。');
             logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
             process.exit(-1);
         }
         if (theme.footer.randomlink && !data.links){
-            logger.error('\n 启用随机链接的情况下，必须提供 links 数据！\n 请新建 links.yaml。');
+            logger.error('\n 启用随机链接的情况下，请新建 links.yaml。');
             logger.error('\n If randomlink is enabled, links data must be supplied! \n Please create links.yaml.');
             process.exit(-1);
         }
@@ -20,4 +20,4 @@ hexo.extend.filter.register('before_post_render', () => {
             process.exit(-1);
         }
     }
-);
+);

package/scripts/helper/related_post.js

@@ -82,4 +82,4 @@ function compare(attr, dateType) {
         }
         return val2 - val1
     }
-}
+}

package/scripts/tags/article.js

@@ -7,33 +7,12 @@ const article = ([path]) => {
   }
   const tags = post.tags.map(tag => `<a class="article-meta__tags fancybox" href="${tag.path}" onclick="event.stopPropagation();"><span class="tags-punctuation"><i class="solitude fa-solid fa-hashtag"></i>${tag.name}</span></a>`).join('');
   const category = post.categories.data.length > 0 ? `<span class="article-meta sticky-warp"><span class="original">${post.categories.data[0].name}</span></span>` : '';
-  return `
-    <div class="recent-post-item" onclick="pjax.loadUrl('${post.path}')">
-      <div class="post_cover">
-        <a href="${post.path}" class="fancybox" title="${post.title}">
-          <img class="post_bg" src="${post.cover}" alt="${post.title}">
-        </a>
-      </div>
-      <div class="recent-post-info">
-        <div class="recent-post-info-top">
-          <div class="recent-post-info-top-tips">
-            ${category}
-          </div>
-          <a class="article-title fancybox" href="${post.path}" title="${post.title}">${post.title}</a>
-        </div>
-        <div class="content">
-        ${post.description ? post.description : ''}
-        </div>
-        <div class="article-meta-wrap">
-          <span class="article-meta tags">
-            ${tags}
-          </span>
-          <span class="post-meta-date">
-            <time datetime="${post.date}" style="display: inline;"></time>
-          </span>
-        </div>
-      </div>
-    </div>`;
+  const postCover = `<div class="post_cover"><a href="${'/' + post.path}" class="fancybox" title="${post.title}"><img class="post_bg" src="${post.cover}" alt="${post.title}"></a></div>`;
+  const recentPostInfoTop = `<div class="recent-post-info-top"><div class="recent-post-info-top-tips">${category}</div><a class="article-title fancybox" href="${'/' + post.path}" title="${post.title}">${post.title}</a></div>`;
+  const content = `<div class="content">${post.description ? post.description : ''}</div>`;
+  const articleMetaWrap = `<div class="article-meta-wrap"><span class="article-meta tags">${tags}</span><span class="post-meta-date"><time datetime="${post.date}" style="display: inline;"></time></span></div>`;
+  const recentPostInfo = `<div class="recent-post-info">${recentPostInfoTop + content + articleMetaWrap}</div>`
+  return `<div class="recent-post-item" onclick="pjax.loadUrl('${'/' + post.path}')">${postCover + recentPostInfo}</div>`;
 }
 
 hexo.extend.tag.register('article', article)

package/scripts/tags/tabs.js

@@ -14,9 +14,7 @@ function postTabs ([name, active], content) {
   let tabNav = ''
   let tabContent = ''
 
-  if (typeof active === 'undefined') {
-    active = 0
-  }
+  active = Number(active) || 0
 
   while ((match = tabBlock.exec(content)) !== null) {
     matches.push(match[1])

package/source/css/_comments/comment.styl

@@ -55,7 +55,9 @@
 
 #post-comment
   .post &
-    padding 0 2rem
+    padding 0 2rem .5rem
+    +maxWidth768()
+      padding 0 .5rem .5rem
   > div.comment-head
     > div.comment-privacy
       display block
@@ -75,7 +77,7 @@
     font-size .6rem
     color var(--efu-secondtext)
     border-radius 8px
-  if index(hexo-config('comment.use'), ',') || hexo-config('comment.use')[1]
+  if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use')
     &.move
       if hexo-config('comment.count')
         .comment-head
@@ -101,7 +103,7 @@
     margin .5rem 0
     position relative
 
-    if index(hexo-config('comment.use'), ',') || ',' in hexo-config('comment.use')
+    if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use')
       .count span:last-child
         display none
 
@@ -137,7 +139,7 @@
             content ''
             transition .4s
 
-  if ',' in hexo-config('comment.use') || index(hexo-config('comment.use'), ',')
+  if hexo-config('comment.use')[1] || index(hexo-config('comment.use'), ',')
     .comment-wrap
       > div:last-child
         display none
@@ -165,4 +167,4 @@ if hexo-config('twikoo.style') && 'Twikoo' in hexo-config('comment.use')
   @import 'twikoo.styl'
 
 if hexo-config('valine.style') && 'Valine' in hexo-config('comment.use')
-  @import 'valine.styl'
+  @import 'valine.styl'

package/source/css/_comments/twikoo.styl

@@ -301,6 +301,9 @@
       font-size .5rem
       color var(--efu-secondtext)
 
+.tk-content
+  margin-top 0!important
+
 .tk-meta-input
   .el-input
     .el-input-group__prepend
@@ -408,10 +411,6 @@ button.el-button.tk-cancel.el-button--default.el-button--small
   border-radius 8px !important
   color var(--efu-fontcolor) !important
 
-.tk-replies .tk-content span:first-child
-  font-size inherit
-  color black
-
 .OwO
   &.OwO-open
     .OwO-body

package/source/css/_global/index.styl

@@ -411,7 +411,7 @@ i.solitude
 span.tags-punctuation
   i
     font-weight bold
-    font-size: 14px
+    font-size: 12px
     transition none
     margin-right: 2px
     opacity: .4

package/source/css/_layout/aside.styl

@@ -744,32 +744,6 @@ if hexo-config('aside.card.style') == 2
     border var(--style-border-always)
 
 #aside-content
-  .card-webinfo
-    .webinfo
-      .webinfo-item-title
-        display flex
-
-        i
-          line-height: 2 !important
-          margin-right: 6px
-          width: 16px
-          text-align: center
-          font-size: 16px !important
-
-      .webinfo-item
-        display flex
-        justify-content space-between
-        white-space nowrap
-        -webkit-box-align center
-        align-items center
-        padding .1rem .5rem 0
-
-        div:first-child
-          -webkit-box-flex 1
-          flex 1 1 0
-          padding-right 1rem
-
-
   .card-allinfo
 
     hr
@@ -1098,3 +1072,27 @@ if hexo-config('aside.newest_comment.enable')
           font-size 12px
           color var(--efu-secondtext)
           margin-top auto
+
+.webinfo-item
+  display flex
+  justify-content space-between
+  white-space nowrap
+  -webkit-box-align center
+  align-items center
+  padding .1rem .5rem 0
+
+  div:first-child
+    -webkit-box-flex 1
+    flex 1 1 0
+    padding-right 1rem
+
+.webinfo
+  .webinfo-item-title
+    display flex
+
+    i
+      line-height: 2
+      margin-right: 6px
+      width: 16px
+      text-align: center
+      font-size: 16px

package/source/css/_layout/fullpage.styl

@@ -21,6 +21,7 @@ if hexo-config('loading.fullpage')
 
     .loading-img
       width 100px
+      height 100px
       margin auto
       animation-duration 0.2s
       animation-name loadingAction

package/source/css/_layout/recent-post.styl

@@ -128,8 +128,6 @@ if hexo-config('index_post_list.direction') == "column"
             display -webkit-box
             overflow hidden
             -webkit-box-orient vertical
-            +minWidth1300()
-              font-size 30px
 
           .recent-post-info-top-tips
             display flex

package/source/css/_page/_about/buff.styl

@@ -13,7 +13,6 @@
     animation gradient 15s ease infinite
     min-height 200px
     height fit-content
-    width calc(60% - (.5rem / 2))
 
     .card-content
       display flex

package/source/css/_page/_about/contentinfo.styl

@@ -7,7 +7,7 @@
     background linear-gradient(120deg, #5b27ff 0, #00d4ff 100%)
     background-size 200%
     animation gradient 15s ease infinite
-    width calc(60% - .5rem / 2)
+    flex 4
 
     .title1
       opacity .8
@@ -28,7 +28,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width calc(40% - (.5rem / 2))
+    flex 3
 
     h2
       margin-right auto

package/source/css/_page/_about/game.styl

@@ -3,7 +3,6 @@
     min-height 300px
     overflow hidden
     color var(--efu-white)
-    width 59%
 
     &::after
       box-shadow 0 -69px 203px 11px #04120f inset
@@ -26,7 +25,6 @@
       padding 1rem 2rem
 
   .author-content-item.game-jl
-    width 39%
     min-height 300px
     overflow hidden
     color var(--efu-white)

package/source/css/_page/_about/maxim.styl

@@ -7,7 +7,6 @@
     align-items flex-start
     flex-direction column
     justify-content center
-    width calc(40% - (.5rem / 2))
 
     .maxim-title
       display flex

package/source/css/_page/_about/myphoto.styl

@@ -4,7 +4,6 @@
     min-height 240px
     position relative
     overflow hidden
-    width calc(40% - (.5rem / 2))
     display flex
     align-items center
     justify-content center

package/source/css/_page/_about/oneself.styl

@@ -10,7 +10,7 @@
         width 100% !important
 
     &.mapAndInfo
-      width calc(60% - (.5rem / 2))
+      flex 8
       gap .5rem
 
   .author-content-item

package/source/css/_page/_about/personalities.styl

@@ -1,7 +1,7 @@
 .author-content-item.personalities
   overflow hidden
   position relative
-  width calc(60% - (.5rem / 2))
+  flex 6
   +maxWidth768()
     min-height 360px
 

package/source/css/_page/_about/skills.styl

@@ -4,7 +4,6 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width calc(50% - (.5rem / 2))
     min-height 450px
 
     .tags-group-all

package/source/css/_page/_about/statistic.styl

@@ -5,7 +5,6 @@
 
   .about-statistic
     min-height 380px
-    width calc(40% - (.5rem / 2))
     background-size cover
     color var(--efu-white)
     overflow hidden

package/source/css/_page/other.styl

@@ -156,6 +156,7 @@ div#banners
 
   +maxWidth768()
     margin-top 0
+    flex-direction column
 
   .author-content-item
     +maxWidth1300()
@@ -172,7 +173,7 @@ div#banners
   margin-top 0
 
 .author-content-item
-  width 49.5%
+  flex 4
   border-radius 12px
   background var(--efu-card-bg)
   border var(--style-border-always)

package/source/css/_post/copyright.styl

@@ -12,6 +12,7 @@
     +maxWidth768()
       box-shadow var(--efu-shadow-border)
       padding: 1rem 1.3rem;
+      margin .5rem
 
     .post-copyright__author_group
       .post-copyright__author_img

package/source/css/_post/meta.styl

@@ -206,7 +206,7 @@
         transition all .3s ease-out 0s
 
       i
-        font-size 16px
+        font-size 13px
         margin-right 4px
 
       > div

package/source/css/_post/tools.styl

@@ -204,6 +204,8 @@
     justify-content: space-between
     flex-wrap: wrap
     padding 0 2rem
+    +maxWidth768()
+      padding: 0 .5rem
 
     .tag_share
       .post-meta__tag-list

package/source/js/covercolor/api.js

@@ -1,4 +1,9 @@
 const coverColor = () => {
+    const page_color = PAGE_CONFIG.color
+    if (page_color){
+        setThemeColors(page_color);
+        return;
+    }
     const path = document.getElementById("post-cover")?.src;
     path ? handleApiColor(path) : setDefaultThemeColors();
 }

package/source/js/covercolor/ave.js

@@ -1,4 +1,9 @@
 const coverColor = () => {
+    const page_color = PAGE_CONFIG.color
+    if (page_color){
+        setThemeColors(page_color);
+        return;
+    }
     const path = document.getElementById("post-cover")?.src;
     path ? handleApiColor(path) : setDefaultThemeColors();
 }

package/source/js/covercolor/local.js

@@ -1,4 +1,9 @@
 const coverColor = () => {
+    const page_color = PAGE_CONFIG.color
+    if (page_color){
+        setThemeColors(page_color);
+        return;
+    }
     const path = document.getElementById("post-cover")?.src;
     path ? localColor(path) : setDefaultThemeColors();
 }

package/source/js/main.js

@@ -154,10 +154,10 @@ const sco = {
     $console.classList.toggle("on", this.musicPlaying);
     if (this.musicPlaying) {
       $meting.aplayer.play();
-      (typeof rm !== 'undefined') && rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.stop) && ($rm_icon.className = 'solitude st-pause-fill')
+      (typeof rm !== 'undefined') && rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.stop) && ($rm_icon.className = 'solitude fas fa-pause')
     } else {
       $meting.aplayer.pause();
-      (typeof rm !== 'undefined') && rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.start) && ($rm_icon.className = 'solitude st-play-fill')
+      (typeof rm !== 'undefined') && rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.start) && ($rm_icon.className = 'solitude fas fa-play')
     }
   },
   switchCommentBarrage() {

package/source/js/right_menu.js

@@ -1,4 +1,5 @@
 let selectTextNow = "";
+let firstShowRightMenu = true;
 const selectText = () => {
     selectTextNow = document.selection
         ? document.selection.createRange().text
@@ -106,9 +107,18 @@ function stopMaskScroll() {
 
 window.oncontextmenu = (ele) => {
     if (document.body.clientWidth <= 768) return;
+    if (GLOBAL_CONFIG.right_menu.ctrlOriginalMenu) {
+        if (firstShowRightMenu) {
+            firstShowRightMenu = false;
+            utils.snackbarShow(GLOBAL_CONFIG.right_menu.ctrlOriginalMenu, false, 2000);
+        }
+        if (ele.ctrlKey) {
+            return true;
+        }
+    }
     let x = ele.clientX + 10;
     let y = ele.clientY;
-    Array.from(rm.menuItems.other).forEach((item) => (item.style.display = "block"));
+    Array.from(rm.menuItems.other).forEach((item) => (item.style.display = "flex"));
     rm.globalEvent = ele;
 
     let display = false;
@@ -117,9 +127,9 @@ window.oncontextmenu = (ele) => {
 
     if (selectTextNow && window.getSelection()) {
         display = true;
-        rm.menuItems.copy.style.display = "block";
-        GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = "block");
-        rm.menuItems.search && (rm.menuItems.search.style.display = "block");
+        rm.menuItems.copy.style.display = "flex";
+        GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = "flex");
+        rm.menuItems.search && (rm.menuItems.search.style.display = "flex");
     } else {
         rm.menuItems.copy.style.display = "none";
         GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = "none");
@@ -128,8 +138,8 @@ window.oncontextmenu = (ele) => {
 
     if (link) {
         display = true;
-        rm.menuItems.new.style.display = "block";
-        rm.menuItems.copyLink.style.display = "block";
+        rm.menuItems.new.style.display = "flex";
+        rm.menuItems.copyLink.style.display = "flex";
         rm.domhref = link;
     } else {
         rm.menuItems.new.style.display = "none";
@@ -138,8 +148,8 @@ window.oncontextmenu = (ele) => {
 
     if (src) {
         display = true;
-        rm.menuItems.copyImg.style.display = "block";
-        rm.menuItems.downloadImg.style.display = "block";
+        rm.menuItems.copyImg.style.display = "flex";
+        rm.menuItems.downloadImg.style.display = "flex";
         rm.domsrc = src;
     } else {
         rm.menuItems.copyImg.style.display = "none";
@@ -149,14 +159,14 @@ window.oncontextmenu = (ele) => {
     let tagName = ele.target.tagName.toLowerCase();
     if (tagName === "input" || tagName === "textarea") {
         display = true;
-        rm.menuItems.paste.style.display = "block";
+        rm.menuItems.paste.style.display = "flex";
     } else {
         rm.menuItems.paste.style.display = "none";
     }
 
     if (tagName === "meting-js") {
         display = true;
-        rm.menuItems.music.forEach((item) => (item.style.display = "block"));
+        rm.menuItems.music.forEach((item) => (item.style.display = "flex"));
     } else {
         rm.menuItems.music[0] &&
             rm.menuItems.music.forEach((item) => (item.style.display = "none"));