hexo-theme-solitude 1.13.4 → 2.0.2

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

@@ -5,11 +5,11 @@
 .banner-button-group
     if theme.footer.randomlink
         a.banner-button.secondary(onclick="travelling()")
-            i.solitude.st-signal-tower-fill
+            i.solitude.fa-solid.fa-tower-broadcast
             span.banner-button-text=_p('link.banner.random')
     if theme.comment.use
         a.banner-button(onclick="sco.scrollToComment()")
-            i.solitude.st-right-btn-fill
+            i.solitude.fa-solid.fa-circle-chevron-right
             span.solitude.banner-button-text=_p('link.banner.toComment')
 
 .tags-group-all.nowrapMove

package/layout/includes/widgets/page/recentcomment/artalk.pug

@@ -53,7 +53,7 @@ script(pjax).
                                             </div>
                                             <div class="comment-content">${i.content}</div>
                                             <div class="comment-title">
-                                            <i class="solitude st-chat-fill"></i>
+                                            <i class="solitude fa-solid fa-comment"></i>
                                             ${i.title}</div>
                                         </div>
                                     `).join('')

package/layout/includes/widgets/page/recentcomment/twikoo.pug

@@ -60,7 +60,7 @@ script(pjax).
                     </div>
                     <div class="comment-content">${formatContent(i.content)}</div>
                     <div class="comment-title">
-                    <i class="solitude st-chat-fill"></i>
+                    <i class="solitude fa-solid fa-comment"></i>
                     ${i.title}</div>
                 </div>
             `).join('')

package/layout/includes/widgets/page/recentcomment/valine.pug

@@ -58,7 +58,7 @@ script(pjax).
                             </div>
                             <div class="comment-content">${i.content}</div>
                             <div class="comment-title">
-                            <i class="solitude st-chat-fill"></i>
+                            <i class="solitude fa-solid fa-comment"></i>
                             ${i.title}</div>
                         </div>
                     `).join('')

package/layout/includes/widgets/page/recentcomment/waline.pug

@@ -50,7 +50,7 @@ script(pjax).
                                     </div>
                                     <div class="comment-content">${i.content}</div>
                                     <div class="comment-title">
-                                    <i class="solitude st-chat-fill"></i>
+                                    <i class="solitude fa-solid fa-comment"></i>
                                     ${i.title}</div>
                                 </div>
                             `).join('')

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

@@ -1,6 +1,6 @@
 .post-reward
     .reward-button(title=_p('award.tipping') onclick="AddRewardMask()")
-        i.solitude.st-hand-heart-fill
+        i.solitude.fa-solid.fa-heart
         =_p('award.tipping')
     .reward-main
         ul.reward-all

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

@@ -13,7 +13,7 @@
             if theme.post.rss
                 .reward-link.mode
                     a.reward-link-button(href=url_for(theme.post.rss))
-                        i.solitude.st-plant-fill
+                        i.solitude.fa-solid.fa-seedling
                         = _p('footer.rss')
     if theme.post.share.enable
         .social-share
@@ -26,31 +26,31 @@
                 case item
                     when 'qq'
                         a.social-share-ico.icon-qq(href=`https://connect.qq.com/widget/shareqq/index.html?url=${encodedPath}&title=${encodedTitle}&desc=${encodedDescription}&summary=${encodedDescription}&site=${encodedTitle}&pics=${encodedIcon}` title=_p('post.share.qq'))
-                            i.solitude.st-qq-fill
+                            i.solitude.fab.fa-qq
                     when 'weibo'
                         a.social-share-ico.icon-weibo(href=`http://service.weibo.com/share/share.php?url=${encodedPath}&title=${encodedTitle}&pic=${encodedIcon}` title=_p('post.share.weibo'))
-                            i.solitude.st-weibo-fill
+                            i.solitude.fab.fa-weibo
                     when 'telegram'
                         a.social-share-ico.icon-telegram(href=`https://t.me/share/url?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.telegram'))
-                            i.solitude.st-telegram-fill
+                            i.solitude.fab.fa-telegram
                     when 'whatsapp'
                         a.social-share-ico.icon-whatsapp(href=`https://api.whatsapp.com/send?text=${encodedTitle} ${encodedPath}` title=_p('post.share.whatsapp'))
-                            i.solitude.st-whatsapp-fill
+                            i.solitude.fab.fa-whatsapp
                     when 'linkedin'
                         a.social-share-ico.icon-linkedin(href=`https://www.linkedin.com/shareArticle?mini=true&url=${encodedPath}&title=${encodedTitle}&summary=${encodedDescription}&source=${encodedTitle}` title=_p('post.share.linkedin'))
-                            i.solitude.st-linkedin-box-fill
+                            i.solitude.fab.fa-linkedin
                     when 'facebook'
                         a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title=_p('post.share.facebook'))
-                            i.solitude.st-facebook-fill
+                            i.solitude.fab.fa-facebook
                     when 'twitter'
                         a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.twitter'))
-                            i.solitude.st-twitter-x-fill
+                            i.solitude.fab.fa-twitter
                     when 'link'
                         .social-share-ico.icon-link(onclick=`utils.copy("${path}")` title=_p('post.share.link'))
-                            i.solitude.st-links-line
+                            i.solitude.fas.fa-link
                     when 'qrcode'
                         .social-share-ico.icon-qrcode(title=_p('post.share.qrcode'))
-                            i.solitude.st-qr-code-fill
+                            i.solitude.fas.fa-qrcode
                             .share-main
                                 .share-main-all
                                     #qrcode

package/layout/includes/widgets/post/post-ai.pug

@@ -1,7 +1,7 @@
 .post-ai
     .ai-title
         .ai-title-left
-            i.ai-title-icon.solitude.st-robot-fill
+            i.ai-title-icon.solitude.fa-solid.fa-robot
             .ai-title-text=_p('post.ai.title')
         .ai-tag#ai-tag= theme.post_ai.modelName
     .ai-explanation(style="display: block;")

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

@@ -10,71 +10,73 @@
                 .post-meta__tag-list
                     each tag in page.tags.data
                         a.post-meta__tags(href=url_for(tag.path))
-                            span.tags-name.tags-punctuation= tag.name
+                            span.tags-name.tags-punctuation
+                                i.solitude.fa-solid.fa-hashtag
+                                = tag.name
     h1.post-title= page.title
     #post-meta
         .meta-secondline
             if theme.post.meta.date
                 span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
-                    i.post-meta-icon.solitude.st-calendar-todo-fill
+                    i.post-meta-icon.solitude.fa-solid.fa-calendar-days
                     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.st-refresh-line
+                    i.post-meta-icon.solitude.fa-solid.fa-arrow-rotate-right
                     time(datetime=date_xml(page.updated))= date_xml(page.updated)
             if theme.wordcount
                 span.post-meta-wordcount
                     if theme.post.meta.wordcount
-                        i.post-meta-icon.solitude.st-word-fill(title=_p('post.wordcount'))
+                        i.post-meta-icon.solitude.fa-solid.fa-file-word(title=_p('post.wordcount'))
                         span.word-count= wordcount(page.content)
                     span.post-meta-separator
                     if theme.post.meta.readtime
-                        i.post-meta-icon.solitude.st-clock-fill(title=_p('post.minread'))
+                        i.post-meta-icon.solitude.fa-solid.fa-clock(title=_p('post.minread'))
                         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.st-map-pin-fill
+                    i.post-meta-icon.solitude.fa-solid.fa-map
                     span= page.locate
             if theme.post.meta.pv
                 a.post-meta-pv(href=url_for(page.path), title=_p('post.pv'))
-                    i.post-meta-icon.solitude.st-fire-fill
+                    i.post-meta-icon.solitude.fa-solid.fa-fire-flame-curved
                     if theme.comment.use && theme.comment.pv
                         case theme.comment.use[0]
                             when "Twikoo"
                                 span#twikoo_visitors
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Waline"
                                 span.waline-pageview-count
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Valine"
                                 span.leancloud_visitors(id=url_for(page.path))
                                     span.leancloud-visitors-count
-                                        i.solitude.st-loading-line
+                                        i.solitude.fa-solid.fa-spinner
                             when 'Artalk'
                                 span#ArtalkPV
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                     else
                         if theme.busuanzi
                             if theme.busuanzi_use === 0
                                 span#busuanzi_value_page_pv
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             else
                                 span#busuanzi_page_pv
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
             if theme.post.meta.comment && page.comment && theme.comment.count && theme.comment.use
                 span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")
-                    i.solitude.st-chat-fill
+                    i.solitude.fa-solid.fa-comment
                     a(href=url_for(page.path) + "#post-comment")
                         case theme.comment.use[0]
                             when "Twikoo"
                                 span.twikoo-count
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Waline"
                                 span.waline-comment-count
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Valine"
                                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when 'Artalk'
                                 span.artalk-count
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner

package/layout/includes/widgets/third-party/comments/comment.pug

@@ -3,7 +3,7 @@
 #post-comment
     .comment-head
         .comment-headline
-            i.solitude.st-chat-fill
+            i.solitude.fa-solid.fa-comment
             span=' ' + _p('comment.title')
             if count && is_post()
                 span.count
@@ -12,13 +12,13 @@
                         case name
                             when "Twikoo"
                                 span.twikoo-count
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Waline"
                                 span.waline-comment-count
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Valine"
                                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                                    i.solitude.st-loading-line
+                                    i.solitude.fa-solid.fa-spinner
                             when "Artalk"
                                 span.artalk-count
                     | )

package/layout/includes/widgets/third-party/search/algolia-search.pug

@@ -2,11 +2,8 @@
     .search-dialog
         .algolia-navbar
             .search-dialog__title#algolia-search-title=__('nav.search')
-            .algolia-tips
-                i.solitude.st-algolia-fill
-                span.algolia-tips-text='Algolia'
             span.search-close-button
-                i.solitude.st-close-fill
+                i.solitude.fa-solid.fa-xmark
         #algolia-input-panel
             #algolia-search-input
         #search-results

package/layout/includes/widgets/third-party/search/local-search.pug

@@ -3,7 +3,7 @@
         nav.search-nav
             span.search-dialog-title=__('nav.search')
             button.search-close-button
-                i.solitude.st-close-fill
+                i.solitude.fa-solid.fa-xmark
         div.search-wrap
             div.search-box
                 input.search-box-input#search-input(type="text", autocomplete="off", spellcheck="false", autocorrect="off", autocapitalize="off", placeholder=__('search.placeholder'))

package/layout/includes/widgets/third-party/tianli-talk.pug

@@ -1,7 +1,7 @@
 - const {key,option,title} = theme.tianli_talk
 
 span.needEndHide#efuTalk(onclick="togglePostChatContainer(); return false;" title=title)
-    i.solitude.st-robot-fill
+    i.solitude.fa-solid.fa-robot
     span.efuTalkTitle=title
 
 script.

package/layout/post.pug

@@ -16,8 +16,9 @@ block content
                         each data in page.tags.data
                             a(href=url_for(data.path)).post-meta__tags
                                 span.tags-punctuation
-                                | #{data.name}
-                                span.tagsPageCount #{data.length}
+                                    i.solitude.fa-solid.fa-hashtag
+                                    =data.name
+                                    span.tagsPageCount=data.length
             if theme.google_adsense.enable && !theme.google_adsense.auto_ads && theme.google_adsense.post_content
                 div.google-ads-warp
                     ins.adsbygoogle(style="display:block; text-align:center; height:284px", data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)

package/layout/tag.pug

@@ -7,8 +7,9 @@ block content
                 each tag in site.tags.find({ parent: { $exists: false } }).data
                     a(id=tag.name class=(tag.name === page.tag ? 'select' : '') href=url_for(tag.path))
                         span.tags-punctuation
-                        | #{tag.name}
-                        span.tagsPageCount #{tag.length}
+                            i.solitude.fa-solid.fa-hashtag
+                            =tag.name
+                            span.tagsPageCount=tag.length
             .recent-posts#recent-posts
                 each post,index in page.posts.find({ parent: { $exists: false } }).data
                     include includes/widgets/home/postList

package/package.json

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

package/plugins.yml

@@ -70,12 +70,12 @@ pace_js:
 swiper_css:
   name: swiper
   file: swiper-bundle.min.css
-  version: 11.1.7
+  version: 11.0.5
   other_name: Swiper
 swiper_js:
   name: swiper
   file: swiper-bundle.min.js
-  version: 11.1.7
+  version: 11.0.5
   other_name: Swiper
 busuanzi_js:
   name: busuanzi
@@ -89,10 +89,10 @@ snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js
   version: 0.1.16
-solitude_css:
-  name: solitude-source
-  file: icon/solitude.min.css
-  version: 1.0.5
+fontawesome:
+  name: font-awesome
+  file: css/all.min.css
+  version: 6.6.0
 medium_zoom:
   name: medium-zoom
   file: dist/medium-zoom.min.js

package/scripts/helper/related_post.js

@@ -41,7 +41,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     relatedPosts.sort(compare('weight', dateType))
 
     let result = '<div class="relatedPosts">'
-    result += `<div class="headline"><i class="solitude st-star-smile-fill"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a></div></div>`
+    result += `<div class="headline"><i class="solitude fa-solid fa-star"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a></div></div>`
     result += '<div class="relatedPosts-list">'
 
     for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {

package/scripts/helper/stylus.js

@@ -21,4 +21,5 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('$highlight_line_number', highlightLineNumber)
     style.define('$prismjs_enable', prismjsEnable)
     style.define('$prismjs_line_number', prismjsLineNumber)
+    style.define('$language', config.language)
 });

package/source/css/_global/index.styl

@@ -358,7 +358,7 @@ b, strong
   position relative
 
 i.solitude
-  font-size 22px
+  font-size 16px
   line-height 1
   font-synthesis style
 
@@ -408,20 +408,20 @@ i.solitude
   opacity 1 !important
   pointer-events all !important
 
-span.tags-punctuation::before
-  content: "\e071"
-  font-family: solitude, serif !important
-  font-size: 12px
-  transition none
-  margin-right: 2px
-  opacity: .4
+span.tags-punctuation
+  i
+    font-weight bold
+    font-size: 14px
+    transition none
+    margin-right: 2px
+    opacity: .4
 
-  .hide-aside #page &
-    font-size 16px
+    .hide-aside #page &
+      font-size 16px
 
-  #post-info &
-    font-size 14px
-    line-height 32px
+    #post-info &
+      font-size 14px
+      line-height 32px
 
 if hexo-config('memorial.enable')
   .memorial

package/source/css/_highlight/index.styl

@@ -56,13 +56,13 @@ figure
         & ~ *
           display none
 
-      .st-copy-fill
+      .copy-button
         position absolute
         cursor pointer
         transition color .2s
         font-size 18px
 
-      .st-copy-fill:hover
+      .copy-button:hover
         color var(--efu-main)
 
       .expand

package/source/css/_highlight/theme/default.styl

@@ -1,7 +1,7 @@
 figure
   &.highlight
     .highlight-tools
-      .st-copy-fill
+      .copy-button
         right .7rem
 
       &.closed

package/source/css/_highlight/theme/mac.styl

@@ -1,7 +1,7 @@
 figure
   &.highlight
     .highlight-tools
-      .st-copy-fill
+      .copy-button
         right 1.7rem
 
       &:after

package/source/css/_layout/console.styl

@@ -216,8 +216,9 @@
     max-width 1400px
 
     i
-      font-size 32px
+      font-size 24px
       margin-right 1.5rem
+      padding 6px 8px
       margin-left auto
       line-height 1
       transform rotate(-30deg)

package/source/css/_layout/footer.styl

@@ -58,7 +58,7 @@
       flex-direction row
 
     i
-      font-size .9rem
+      font-size .8rem
       line-height .9rem
       height .9rem
 

package/source/css/_layout/header.styl

@@ -143,9 +143,6 @@
       .nav-button
         margin-left .5rem
 
-        &#nav-totop
-          margin-right .5rem
-
         a
           height 35px
           width 35px
@@ -166,7 +163,56 @@
             transition .3s
 
           &.console_switchbutton
-            padding 4px 8px
+            padding 10px 8px
+
+            &:hover
+              label
+                i
+                  background var(--efu-white)
+
+                .left
+                  width .5rem
+                  height .3rem
+
+                .center
+                  width .5rem
+                  height .3rem
+
+                .right
+                  width .3rem
+                  height 100%
+
+            label
+              display flex
+              position relative
+              width 100%
+              height 100%
+              cursor pointer
+
+              i
+                transition all .3s
+                position absolute
+                border-radius 12px
+                background var(--efu-fontcolor)
+
+                .post &
+                  background var(--efu-white)
+
+                &.left
+                  top 0
+                  width 100%
+                  height .3rem
+
+                &.center
+                  bottom 0
+                  width .3rem
+                  height .3rem
+
+                &.right
+                  right 0
+                  bottom 0
+                  width .5rem
+                  height .3rem
 
         &.long
           a
@@ -344,23 +390,20 @@
         i, span, img
           opacity 0
 
-      &:after
+      i.fa-solid.fa-home
         +minWidth900()
           opacity: 1
 
-    &:after
-      +minWidth900()
-        opacity 0
-        position absolute
-        display flex
-        z-index 1
-        content "\e008"
-        font-family solitude, serif
-        align-items center
-        justify-content center
-        font-size 22px
-        line-height 1
-        color var(--efu-card-bg)
+    i.fa-solid.fa-home
+      opacity 0
+      position absolute
+      display flex
+      z-index 1
+      align-items center
+      justify-content center
+      font-size 22px
+      line-height 1
+      color var(--efu-card-bg)
 
     if hexo-config('site.name.class') == i_class
       i
@@ -489,7 +532,7 @@
 
             i
               &:not(.fa-brands)
-                font-size 22px
+                font-size 16px
                 margin-right 8px
                 line-height 1
 
@@ -752,13 +795,13 @@ if hexo-config('nav.group')
         +minWidth900()
           align-items center
 
-      &:after
+      &:before
         color var(--efu-white)
 
   .nav-fixed
     #nav
       #site-name
-        &:after
+        i.fa-solid.fa-home
           color var(--efu-card-bg)
 
   .not-top-img
@@ -866,6 +909,8 @@ if hexo-config('nav.group')
           height 35px
           line-height 35px
           border-radius 40px
+          if $language == 'en-US'
+            letter-spacing normal
 
 #travellings_button
   display inline

package/source/css/_page/_home/category-bar.styl

@@ -54,7 +54,7 @@
       border-radius 8px
       padding 0 8px
 
-    div:hover,a:hover
+    div:hover, a:hover
       background var(--efu-secondbg-bg)
       color var(--efu-lighttext)
 
@@ -74,9 +74,9 @@
       display: none
 
     .category-bar-item
-        a:hover
-          background var(--efu-main)
-          color var(--efu-white)
+      a:hover
+        background var(--efu-main)
+        color var(--efu-white)
 
       a
         padding .1rem .5rem

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

@@ -129,6 +129,8 @@
             border-radius 0 0 12px 0
             transition .3s
             cursor pointer
+            if $language == 'en-US'
+              left -90px
 
       /.recent-post-info
         padding .3rem .5rem .3rem .5rem

package/source/css/_page/_home/hot-tip.styl

@@ -8,4 +8,5 @@
   gap 1px
 
   i
-    font-size 10px
+    font-size 10px
+    margin-right 2px