hexo-theme-solitude 3.0.5 → 3.0.7

package/_config.yml

@@ -112,8 +112,8 @@ carousel: false
 # Aside
 # 侧边栏
 aside:
-  # Values: about (info card), newestPost (latest article), allInfo (website information), flip (official account QR code), newest_comment (latest comment)
-  # 值: about(信息卡), newestPost(最新文章), allInfo(网站信息), flip(官方账号二维码), newest_comment(最新评论)
+  # Values: about (info card), newestPost (latest article), allInfo (website information), newest_comment (latest comment)
+  # 值: about(信息卡), newestPost(最新文章), allInfo(网站信息), newest_comment(最新评论)
 
   # Sticky: Fixed position / noSticky: Not fixed position
   # Sticky: 固定位置 / noSticky: 不固定位置
@@ -157,16 +157,6 @@ aside:
     #  Bilibili: https://space.bilibili.com/1329819902 || fab fa-bilibili
   # --------------------------- end ---------------------------
 
-  # --------------------------- start ---------------------------
-  # Sidebar QR code component
-  # 侧边栏二维码组件
-  flip:
-    favicon: # url (favicon)
-    face: # url (QR code)
-    backface: # url (QR code)
-    backcolor: "var(--efu-blue)" # Background color
-  # --------------------------- end ---------------------------
-
   # --------------------------- start ---------------------------
   # article table of contents
   # 文章目录
@@ -187,14 +177,6 @@ aside:
       # - Hexo
   # --------------------------- end ---------------------------
 
-  # --------------------------- start ---------------------------
-  # Archive
-  # 归档
-  archive:
-    enable: false
-    type: "month" # month: by month / year: by year
-  # --------------------------- end ---------------------------
-
   # --------------------------- start ---------------------------
   # Site Info
   # 网站信息
@@ -510,7 +492,7 @@ console:
     tags: true
     # Archives
     # 归档
-    archive: true
+    archive: "month" # month: by month / year: by year
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------

package/layout/404.pug

@@ -8,7 +8,7 @@ block content
                 h1.error_title 404
                 .error_subtitle= theme.errorpage.text
                 a.button--animated(href=url_for("/"))
-                    i.solitude.fa-solid.fa-arrow-up-right-from-square
+                    i.solitude.fas.fa-arrow-up-right-from-square
                     =_p('404.button')
 
     if theme.errorpage.recommendList

package/layout/includes/console.pug

@@ -5,7 +5,7 @@
 
 div#console
     div.close-btn(onclick="sco.hideConsole()")
-        i.solitude.fa-solid.fa-xmark
+        i.solitude.fas.fa-xmark
     div.console-card-group
         if use && recentComment.enable
             div.console-card-group-left
@@ -16,7 +16,7 @@ div#console
                             | #{_p('console.comment_title')}
                             if theme.recent_comments.enable
                                 a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
-                                    i.solitude.fa-solid.fa-circle-chevron-right
+                                    i.solitude.fas.fa-circle-chevron-right
                     .console_recentcomments
                         - var sel = '.console-card .console_recentcomments'
                         case use[0]
@@ -45,25 +45,39 @@ div#console
                                     sup= tag.length
                 if card.archive
                     div.console-card.history(onclick="sco.hideConsole()")
-                        include ./widgets/aside/asideArchive.pug
+                        - var archives = getArchiveLength(card.archive ? card.archive : 'year')
+                        ul.card-archive-list
+                            each value, key in archives
+                                li.item
+                                    a(href=`/archives/${key}/`)
+                                        span.date= key
+                                        .count-group
+                                            span.count= value
+                                            span.unit= __('console.archive_unit')
+                            li.item
+                                a(href='/archives/')
+                                    span.date= __('console.archive_all')
+                                    .count-group
+                                        span.count= site.posts.length
+                                        span.unit= __('console.archive_unit')
 
     div.button-group
         div.console-btn-item
             span.darkmode_switchbutton(onclick="sco.switchDarkMode()", title=_p('console.switch_darkmode'))
-                i.solitude.fa-solid.fa-circle-half-stroke
+                i.solitude.fas.fa-circle-half-stroke
         div.console-btn-item#consoleHideAside
             span.asideSwitch(onclick="sco.switchHideAside()", title=_p('console.switch_hideAside'))
                 i.solitude.fas.fa-arrows-left-right-to-line
         if theme.keyboard.enable
             div.console-btn-item#consoleKeyboard(onclick="sco.switchKeyboard()")
                 span.keyboardSwitch(title=_p('console.switch_keyboard'))
-                    i.solitude.fa-solid.fa-keyboard
+                    i.solitude.fas.fa-keyboard
         if theme.capsule.enable
             div.console-btn-item#consoleMusic(onclick="sco.musicToggle()")
                 span.music-switch(title=_p('console.switch_music'))
-                    i.solitude.fa-solid.fa-compact-disc
+                    i.solitude.fas.fa-compact-disc
         if theme.comment.use && theme.comment.commentBarrage
             div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()")
                 span.commentBarrage
-                    i.solitude.fa-solid.fa-comment
+                    i.solitude.fas.fa-comment
     div.console-mask(onclick="sco.hideConsole()")

package/layout/includes/footer.pug

@@ -44,7 +44,7 @@ if group
                 div.footer-title-group
                     h3.footer-title= _p('footer.randomlink')
                     button.random-friends-btn(onclick='randomLinksList()', title=_p('footer.randomlink'))
-                        i.solitude.fa-solid.fa-arrows-rotate
+                        i.solitude.fas.fa-arrows-rotate
                 div.footer-links#friend-links-in-footer
 div#footer-bar
     div.footer-bar-links

package/layout/includes/keyboard.pug

@@ -18,7 +18,7 @@ script.
 
     const keyboard_addKeydown = (e) => {
         const keyboards = !{JSON.stringify(list)};
-        if (e.keyCode === 16) {
+        if (e.key === 'Shift') {
             document.getElementById('keyboard-tips').classList.add('show');
         }
 

package/layout/includes/mixins/articleSort.pug

@@ -12,5 +12,5 @@ each post in page.posts.find({ parent: { $exists: false } }).data
                 each tags in post.tags.data
                     a.article-meta__tags(href=url_for(tags.path) onclick="window.event.cancelBubble=true;")
                         span.tags-punctuation
-                            i.solitude.fa-solid.fa-hashtag
+                            i.solitude.fas.fa-hashtag
                             =tags.name

package/layout/includes/mixins/pagination.pug

@@ -1,8 +1,8 @@
 nav#pagination
     div.pagination
-        - var options = {mid_size: 1,escape: false,next_text: `<div class="pagination_tips_next">${_p("pagination.next")}</div> <i class="solitude fa-solid fa-chevron-right"></i>`,prev_text: `<i class="solitude fa-solid fa-chevron-left"></i> <div class="pagination_tips_prev">${_p("pagination.prev")}</div>`}
+        - var options = {mid_size: 1,escape: false,next_text: `<div class="pagination_tips_next">${_p("pagination.next")}</div> <i class="solitude fas fa-chevron-right"></i>`,prev_text: `<i class="solitude fas fa-chevron-left"></i> <div class="pagination_tips_prev">${_p("pagination.prev")}</div>`}
         !=paginator(options)
         div.toPageGroup
             input#toPageText(oninput="value=value.replace(/[^0-9]/g,'')" maxlength="3" title=_p('pagination.to') onkeyup="if (this.value === '0') this.value = ''")
             a#toPageButton(onclick="sco.toPage()")
-                i.solitude.fa-solid.fa-angles-right
+                i.solitude.fas.fa-angles-right

package/layout/includes/nav.pug

@@ -12,7 +12,7 @@ nav#nav.show
                     img(src=theme.site.name.custom, alt=config.title)
                 else if theme.site.name.class === 'text'
                     span.title= theme.site.name.custom
-                i.solitude.fa-solid.fa-home
+                i.solitude.fas.fa-home
         #page-name-mask
             #page-name
                 a#page-name-text(onclick="sco.toTop()")= title || config.title

package/layout/includes/page/brevity.pug

@@ -13,7 +13,7 @@ if theme.brevity.enable
                                     time.datetime.bber_date(datetime=moment(item.date).format())
                                 if item.content
                                     a.bber-reply.goComment(onclick=`sco.toTalk('${item.content}')`)
-                                        i.solitude.fa-solid.fa-comment
+                                        i.solitude.fas.fa-comment
 
                         #bber-content
                             p.datacont= item.content
@@ -38,7 +38,7 @@ if theme.brevity.enable
                             .bber-bottom
                                 .bber-info
                                     .bber-info-time
-                                        i.solitude.fa-solid.fa-calendar-day
+                                        i.solitude.fas.fa-calendar-day
                                         time.datetime(datetime=moment(item.date).format())
                                     if item.location
                                         .bber-info-location
@@ -46,11 +46,11 @@ if theme.brevity.enable
                                             = item.location
                                     if item.link
                                         a.bber-content-link(href=url_for(item.link) target="_blank")
-                                            i.solitude.fa-solid.fa-link
+                                            i.solitude.fas.fa-link
                                             = _p('essay.link')
                                 if item.content
                                     a.bber-reply(onclick=`sco.toTalk('${item.content}')`)
-                                        i.solitude.fa-solid.fa-comment
+                                        i.solitude.fas.fa-comment
             #bber-tips
                 if theme.brevity.strip === -1
                     = _p('essay.tip0')

package/layout/includes/page/categories.pug

@@ -4,6 +4,6 @@ h1.page-title= _p('page.category')
         each item in site.categories.find({ parent: { $exists: false } }).data
             a(href=url_for(item.path))
                 span.tags-punctuation
-                    i.solitude.fa-solid.fa-hashtag
+                    i.solitude.fas.fa-hashtag
                     = item.name
                     span.tagsPageCount= item.length

package/layout/includes/page/tags.pug

@@ -4,6 +4,6 @@ h1.page-title= __('page.tag')
         each tag in site.tags.find({ parent: { $exists: false } }).data
             a(href=url_for(tag.path))
                 span.tags-punctuation
-                    i.solitude.fa-solid.fa-hashtag
+                    i.solitude.fas.fa-hashtag
                     = tag.name
                     span.tagsPageCount= tag.length

package/layout/includes/rightmenu.pug

@@ -3,52 +3,52 @@
 div#rightMenu
     div.rightMenu-group.rightMenu-small
         div.rightMenu-item#menu-backward
-            i.solitude.fa-solid.fa-arrow-left
+            i.solitude.fas.fa-arrow-left
         div.rightMenu-item#menu-forward
-            i.solitude.fa-solid.fa-arrow-right
+            i.solitude.fas.fa-arrow-right
         div.rightMenu-item#menu-refresh
-            i.solitude.fa-solid.fa-arrows-rotate
+            i.solitude.fas.fa-arrows-rotate
         div.rightMenu-item#menu-top
-            i.solitude.fa-solid.fa-arrow-up
+            i.solitude.fas.fa-arrow-up
     div.rightMenu-group.rightMenu-line.rightMenuPlugin
         div.rightMenu-item#menu-copytext
-            i.solitude.fa-solid.fa-clone
+            i.solitude.fas.fa-clone
             span= _p('right_menu.copy')
         div.rightMenu-item#menu-pastetext
-            i.solitude.fa-solid.fa-clipboard
+            i.solitude.fas.fa-clipboard
             span= _p('right_menu.paste')
         if theme.comment.use
             div.rightMenu-item#menu-commenttext
-                i.solitude.fa-solid.fa-comment-medical
+                i.solitude.fas.fa-comment-medical
                 span= _p('right_menu.comment')
         div.rightMenu-item#menu-newwindow
-            i.solitude.fa-regular.fa-window-maximize
+            i.solitude.far.fa-window-maximize
             span= _p('right_menu.new')
         div.rightMenu-item#menu-copylink
-            i.solitude.fa-solid.fa-link
+            i.solitude.fas.fa-link
             span= _p('right_menu.link')
         div.rightMenu-item#menu-copyimg
-            i.solitude.fa-solid.fa-clone
+            i.solitude.fas.fa-clone
             span= _p('right_menu.img')
         div.rightMenu-item#menu-downloadimg
-            i.solitude.fa-solid.fa-cloud-arrow-down
+            i.solitude.fas.fa-cloud-arrow-down
             span= _p('right_menu.downloadImg')
         if theme.search.enable
             div.rightMenu-item#menu-search
-                i.solitude.fa-solid.fa-magnifying-glass
+                i.solitude.fas.fa-magnifying-glass
                 span= _p('right_menu.search')
         if theme.capsule.enable
             div.rightMenu-item#menu-music-toggle
-                i.solitude.fa-solid.fa-play
+                i.solitude.fas.fa-play
                 span= _p('right_menu.music.start')
             div.rightMenu-item#menu-music-back
-                i.solitude.fa-solid.fa-backward
+                i.solitude.fas.fa-backward
                 span= _p('right_menu.music.back')
             div.rightMenu-item#menu-music-forward
-                i.solitude.fa-solid.fa-forward
+                i.solitude.fas.fa-forward
                 span= _p('right_menu.music.forward')
             div.rightMenu-item#menu-music-copyMusicName
-                i.solitude.fa-solid.fa-clone
+                i.solitude.fas.fa-clone
                 span= _p('right_menu.music.copyMusicName')
     if custom_list.length > 0
         div.rightMenu-group.rightMenu-line.rightMenuOther
@@ -59,10 +59,10 @@ div#rightMenu
     div.rightMenu-group.rightMenu-line.rightMenuOther
         if theme.right_menu.commentBarrage && theme.comment.use && theme.comment.commentBarrage
             div.rightMenu-item#menu-commentBarrage(onclick="sco.switchCommentBarrage()")
-                i.solitude.fa-solid.fa-comment
+                i.solitude.fas.fa-comment
                 span.menu-commentBarrage-text= _p('right_menu.barrage.close')
         div.rightMenu-item#menu-darkmode(onclick="sco.switchDarkMode()")
-            i.solitude.fa-solid.fa-circle-half-stroke
+            i.solitude.fas.fa-circle-half-stroke
             case theme.display_mode.type
                 when 'auto'
                 when 'light'
@@ -71,7 +71,7 @@ div#rightMenu
                     span.menu-darkmode-text= _p('right_menu.dark')
         if theme.right_menu.translate
             div.rightMenu-item#menu-translate
-                i.solitude.fa-solid.fa-language
+                i.solitude.fas.fa-language
                 case theme.translate.defaultEncoding
                     when 2
                         span= _p('right_menu.chs_to_cht')

package/layout/includes/sidebar.pug

@@ -26,12 +26,12 @@ div#sidebar(style="zoom: 1;")
         span.sidebar-menu-item-title= __('sidebar.function')
         div.sidebar-menu-item
             span.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()")
-                i.solitude.fa-solid.fa-circle-half-stroke
+                i.solitude.fas.fa-circle-half-stroke
                 span= __('sidebar.darkmode')
         include ./widgets/nav/group
         include ./widgets/nav/menu.pug
         span.sidebar-menu-item-title= __('page.tag')
-        div.card-widget.card-tags.card-archives.card-webinfo.card-allinfo
+        div.card-tags
             div.card-tag-cloud
                 each tag in site.tags.find({ parent: { $exists: false } }).data
                     a(href=url_for(tag.path))= tag.name
@@ -40,8 +40,5 @@ div#sidebar(style="zoom: 1;")
             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)
-
+                    .item-name= __('aside.wordcount')
+                    .item-count= totalcount(site)

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

@@ -12,12 +12,12 @@ else if(is_page() || is_archive() || is_tag() || is_category())
     - Sticky = aside.page.Sticky ? aside.page.Sticky.split(',') : null
 if noSticky || Sticky
     .aside-content#aside-content
-        each item in noSticky
+        each item in noSticky || []
             include ./asideSwitch.pug
         .sticky_layout
             if showToc
                 include ./asideToc.pug
-            each item in Sticky
+            each item in Sticky || []
                 include ./asideSwitch.pug
 else
     style.

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

@@ -2,7 +2,4 @@
     if theme.aside.tags.enable
         include ./asideTag
         hr
-    if theme.aside.archive.enable
-        include ./asideArchive
-        hr
     include ./asideWebInfo

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

@@ -1,20 +1,19 @@
 .card-widget.card-info
     .card-content
         .card-info-avatar.is-center
-            .author-info__top-group
-                .author-info__sayhi#author-info__sayhi(onclick="sco.changeWittyWord()")
-        .avatar-img-group
-            img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.my_card.author.img)
+            .top-group
+                .sayhi#sayhi(onclick="sco.changeWittyWord()")
+        .avatar
+            img(alt=_p('aside.avatar'), src=theme.aside.my_card.author.img)
             if theme.aside.my_card.author.sticker
-                .avatar-sticker
-                    img.avatar-sticker-img(src=theme.aside.my_card.author.sticker, alt=_p('aside.sticker'))
-        .author-info__description_group
-            .author-info__description!= theme.aside.my_card.content
-        .author-info__bottom-group
-            span.author-info__bottom-group-left
-                .author-info__name= config.author
-                .author-info__desc!= theme.aside.my_card.description
-            .card-info-social-icons.is-center
+                .sticker
+                    img.sticker-img(src=theme.aside.my_card.author.sticker, alt=_p('aside.sticker'))
+        .description!= theme.aside.my_card.content
+        .bottom-group
+            span.left
+                .name= config.author
+                .desc!= theme.aside.my_card.description
+            .social-icons.is-center
                 each value, label in theme.aside.my_card.information || {}
                     - var array = value.split('||')
                     a.social-icon(href=url_for(trim(array[0])), title=label)

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

@@ -1,6 +1,6 @@
 .card-widget.card-recent-post
     .item-headline
-        i.solitude.fa-solid.fa-map
+        i.solitude.fas.fa-map
         span= _p('aside.newpost')
     .aside-list
         each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1).slice(0, 5)
@@ -11,4 +11,4 @@
                 .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
+                        span.categories(href=url_for(post.path))= post.categories.data[0].name

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

@@ -1,9 +1,9 @@
 .card-widget.card-recent-comment
     .item-headline
-        i.solitude.fa-solid.fa-comment
+        i.solitude.fas.fa-comment
         span= _p('aside.newcomment')
         if theme.recent_comments.enable
             a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
-                i.solitude.fa-solid.fa-circle-chevron-right
+                i.solitude.fas.fa-circle-chevron-right
     .aside-list
     include ../third-party/news-comment/newest-comment.pug

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

@@ -1,8 +1,6 @@
 case item
     when 'about'
         include ./asideInfoCard.pug
-    when 'flip'
-        include ./asideFlipCard.pug
     when 'newestPost'
         include ./asideNewestPost.pug
     when 'allInfo'
@@ -15,5 +13,3 @@ case item
         - const custom = site.data?.aside?.find((i) => i.name === item)
         if custom
             include ./asideCustom.pug
-        else
-            include ../../page/default.pug

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

@@ -1,5 +1,5 @@
 .card-widget#card-toc
     .item-headline
-        i.solitude.fa-solid.fa-bars
+        i.solitude.fas.fa-bars
         span= __('aside.toc')
     .toc-content#toc-content!= toc(page.content, { list_number: false })

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

@@ -1,48 +1,36 @@
 .webinfo
     if theme.aside.siteinfo.postcount
         .webinfo-item
-            .webinfo-item-title
-                i.item-icon.fa-solid.fa-folder-closed
-                .item-name= __('aside.postcount')
+            .item-name= __('aside.postcount')
             .item-count= site.posts.length
     if theme.busuanzi
         if theme.aside.siteinfo.pv
             .webinfo-item
-                .webinfo-item-title
-                    i.item-icon.solitude.fa-solid.fa-eye
-                    .item-name= __('aside.pv')
+                .item-name= __('aside.pv')
                 if theme.busuanzi_use === 0
                     span#busuanzi_value_site_pv
-                        i.solitude.fa-solid.fa-spinner.fa-spin
+                        i.solitude.fas.fa-spinner.fa-spin
                 else
                     span#busuanzi_site_pv
-                        i.solitude.fa-solid.fa-spinner.fa-spin
+                        i.solitude.fas.fa-spinner.fa-spin
         if theme.aside.siteinfo.uv
             .webinfo-item
-                .webinfo-item-title
-                    i.item-icon.solitude.fa-solid.fa-user
-                    .item-name= __('aside.uv')
+                .item-name= __('aside.uv')
                 if theme.busuanzi_use === 0
                     span#busuanzi_value_site_uv
-                        i.solitude.fa-solid.fa-spinner.fa-spin
+                        i.solitude.fas.fa-spinner.fa-spin
                 else
                     span#busuanzi_site_uv
-                        i.solitude.fa-solid.fa-spinner.fa-spin
+                        i.solitude.fas.fa-spinner.fa-spin
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item
-            .webinfo-item-title
-                i.item-icon.solitude.fa-solid.fa-calendar-day
-                .item-name= __('aside.runtime')
+            .item-name= __('aside.runtime')
             .item-count#runtimeshow
     if theme.aside.siteinfo.updatetime
         .webinfo-item
-            .webinfo-item-title
-                i.item-icon.solitude.fa-solid.fa-arrows-rotate
-                .item-name= __('aside.updatetime')
+            .item-name= __('aside.updatetime')
             time.item-count(datetime=new Date())
     if theme.wordcount && theme.aside.siteinfo.wordcount
         .webinfo-item
-            .webinfo-item-title
-                i.item-icon.solitude.fa-solid.fa-file-word
-                .item-name= __('aside.wordcount')
+            .item-name= __('aside.wordcount')
             .item-count= totalcount(site)

package/layout/includes/widgets/home/bbTimeList.pug

@@ -1,16 +1,16 @@
 .bbTimeList.container#bbTimeList(class=is_home_first_page() ? '' : 'more-page')
-    i.bber-logo.solitude.fa-solid.fa-newspaper(onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)
+    i.bber-logo.solitude.fas.fa-newspaper(onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)
     .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1" onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)
         .swiper-wrapper#bber-talk
             each item, i in site.data.brevity.slice(0, 10)
                 .li-style.swiper-slide
                     | #{item.content}
                     if item.image
-                        i.solitude.fa-solid.fa-image
+                        i.solitude.fas.fa-image
                     else if item.aplayer
-                        i.solitude.fa-solid.fa-disc
+                        i.solitude.fas.fa-disc
                     else if item.video || item.bilibili
-                        i.solitude.fa-solid.fa-video
+                        i.solitude.fas.fa-video
                     else if item.link
-                        i.solitude.fa-solid.fa-link
-    i.bber-gotobb.solitude.fa-solid.fa-circle-chevron-right(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)
+                        i.solitude.fas.fa-link
+    i.bber-gotobb.solitude.fas.fa-circle-chevron-right(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)

package/layout/includes/widgets/home/categoryBar.pug

@@ -8,9 +8,9 @@
             a(href=url_for(item.path))= item.name
 div.category-bar-right
     - let categories = site.categories.find({parent: {$exists: false}})
-    - let wordcount = categories.map(category => category.name).join('').length
-    if wordcount > 40 || categories.data.length > 10
+    - let word_count = categories.map(category => category.name).join('').length
+    if word_count > 40 || categories.data.length > 10
         .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
-            i.solitude.fa-solid.fa-angles-right
+            i.solitude.fas.fa-angles-right
     if theme.page.categories
-        a.category-bar-more(href=url_for('/categories/'))= __('more')
+        a.category-bar-more(href=url_for('/categories/'))= __('more')

package/layout/includes/widgets/home/postList.pug

@@ -7,7 +7,7 @@ mixin info
         div.recent-post-info-top-tips
             if post.sticky && is_home()
                 span.article-meta.sticky-warp
-                    i.solitude.fa-solid.fa-thumbtack.sticky.orange
+                    i.solitude.fas.fa-thumbtack.sticky.orange
                     span.sticky.orange= _p('home.sticky')
             each category in post.categories.data
                 span.original= category.name
@@ -24,7 +24,7 @@ mixin info
             each tag in post.tags.data
                 a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
                     span.tags-punctuation
-                        i.solitude.fa-solid.fa-hashtag
+                        i.solitude.fas.fa-hashtag
                         =tag.name
 
         span.post-meta-date

package/layout/includes/widgets/home/topGroup.pug

@@ -18,7 +18,7 @@ mixin todayCardContent
     if filteredPosts.length > 0
         .banner-button-group
             a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
-                i.solitude.fa-solid.fa-circle-plus
+                i.solitude.fas.fa-circle-plus
                 span.banner-button-text= _p('home.recommendmore')
 
 case theme.hometop.recommendList.url.startsWith('/')

package/layout/includes/widgets/nav/right.pug

@@ -6,11 +6,11 @@ each item in custom
 if theme.nav.right.random
     .nav-button#randomPost_button
         a.site-page(onclick="toRandomPost()", title=_p('nav.randompost'), href="javascript:void(0);")
-            i.solitude.fa-solid.fa-dice-d6
+            i.solitude.fas.fa-dice-d6
 if theme.search.enable
     .nav-button#search-button
         a.site-page.social-icon.search(href="javascript:void(0);", title=_p('nav.search'))
-            i.solitude.fa-solid.fa-magnifying-glass
+            i.solitude.fas.fa-magnifying-glass
 if theme.console.enable
     .nav-button#nav-console
         a.console_switchbutton(onclick="sco.showConsole()", title=_p('nav.console'), href="javascript:void(0);")
@@ -21,8 +21,8 @@ if theme.console.enable
 if !theme.rightside.percent
     .nav-button#nav-totop(onclick="sco.toTop()")
         a.totopbtn
-            i.solitude.fa-solid.fa-arrow-up
+            i.solitude.fas.fa-arrow-up
             span#percent= "0"
 #toggle-menu
     a.site-page
-        i.solitude.fa-solid.fa-bars
+        i.solitude.fas.fa-bars

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

@@ -14,7 +14,7 @@ if site.data.about.rewardList && site.data.about.award.enable
                     .reward-list-item
                         .reward-list-item-name= reward.name
                         .reward-list-bottom-group
-                            .reward-list-item-money(style=(reward.vip ? "background: var(--efu-vip);color: var(--efu-white)" : ""))
+                            .reward-list-item-money(style="background-color:" + reward.color)
                                 if reward.icon
                                     i.solitude(class=reward.icon)
                                 | ¥ #{reward.money}
@@ -23,7 +23,7 @@ if site.data.about.rewardList && site.data.about.award.enable
                     .post-reward
                         .post-reward(onclick="AddRewardMask()")
                         .reward-button(title=_p('award.tipping'))
-                            i.solitude.fa-solid.fa-heart
+                            i.solitude.fas.fa-heart
                             = _p('award.tipping')
                         .reward-main
                             ul.reward-all

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

@@ -34,5 +34,5 @@ if site.data.about.likes
                         if like.button
                             .banner-button-group
                                 a.banner-button(href=url_for(like.button_link))
-                                    i.solitude.fa-solid.fa-circle-chevron-right
+                                    i.solitude.fas.fa-circle-chevron-right
                                     span.banner-button-text= like.button_text