hexo-theme-solitude 3.0.21 → 4.0.0

package/layout/includes/rightmenu.pug

@@ -11,70 +11,70 @@ div#rightMenu
         div.rightMenu-item#menu-top
             i.solitude.fas.fa-arrow-up
     div.rightMenu-group.rightMenu-line.rightMenuPlugin
-        div.rightMenu-item#menu-copytext
+        div.rightMenu-item#menu-copytext(title=_p('right_menu.copy') heotip=_p('right_menu.copy'))
             i.solitude.fas.fa-clone
             span= _p('right_menu.copy')
-        div.rightMenu-item#menu-pastetext
+        div.rightMenu-item#menu-pastetext(title=_p('right_menu.paste') heotip=_p('right_menu.paste'))
             i.solitude.fas.fa-clipboard
             span= _p('right_menu.paste')
         if theme.comment.use
-            div.rightMenu-item#menu-commenttext
+            div.rightMenu-item#menu-commenttext(title=_p('right_menu.comment') heotip=_p('right_menu.comment'))
                 i.solitude.fas.fa-comment-medical
                 span= _p('right_menu.comment')
-        div.rightMenu-item#menu-newwindow
+        div.rightMenu-item#menu-newwindow(title=_p('right_menu.new') heotip=_p('right_menu.new'))
             i.solitude.far.fa-window-maximize
             span= _p('right_menu.new')
-        div.rightMenu-item#menu-copylink
+        div.rightMenu-item#menu-copylink(title=_p('right_menu.link') heotip=_p('right_menu.link'))
             i.solitude.fas.fa-link
             span= _p('right_menu.link')
-        div.rightMenu-item#menu-copyimg
+        div.rightMenu-item#menu-copyimg(title=_p('right_menu.img') heotip=_p('right_menu.img'))
             i.solitude.fas.fa-clone
             span= _p('right_menu.img')
-        div.rightMenu-item#menu-downloadimg
+        div.rightMenu-item#menu-downloadimg(title=_p('right_menu.downloadImg') heotip=_p('right_menu.downloadImg'))
             i.solitude.fas.fa-cloud-arrow-down
             span= _p('right_menu.downloadImg')
         if theme.search.enable
-            div.rightMenu-item#menu-search
+            div.rightMenu-item#menu-search(title=_p('right_menu.search') heotip=_p('right_menu.search'))
                 i.solitude.fas.fa-magnifying-glass
                 span= _p('right_menu.search')
         if theme.capsule.enable
-            div.rightMenu-item#menu-music-toggle
+            div.rightMenu-item#menu-music-toggle(title=_p('right_menu.music.start') heotip=_p('right_menu.music.start'))
                 i.solitude.fas.fa-play
                 span= _p('right_menu.music.start')
-            div.rightMenu-item#menu-music-back
+            div.rightMenu-item#menu-music-back(title=_p('right_menu.music.back') heotip=_p('right_menu.music.back'))
                 i.solitude.fas.fa-backward
                 span= _p('right_menu.music.back')
-            div.rightMenu-item#menu-music-forward
+            div.rightMenu-item#menu-music-forward(title=_p('right_menu.music.forward') heotip=_p('right_menu.music.forward'))
                 i.solitude.fas.fa-forward
                 span= _p('right_menu.music.forward')
-            div.rightMenu-item#menu-music-copyMusicName
+            div.rightMenu-item#menu-music-copyMusicName(title=_p('right_menu.music.copyMusicName') heotip=_p('right_menu.music.copyMusicName'))
                 i.solitude.fas.fa-clone
                 span= _p('right_menu.music.copyMusicName')
     if custom_list.length > 0
         div.rightMenu-group.rightMenu-line.rightMenuOther
             each item,index in custom_list
-                div.rightMenu-item(id=item.id class=item.class onclick=item.click+'||rm.hideRightMenu()')
+                div.rightMenu-item(id=item.id class=item.class data-solitude-action="runConfiguredAction" data-solitude-value=item.click title=item.name heotip=item.name)
                     i.solitude(class=item.icon)
                     span= item.name
     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()")
+            div.rightMenu-item#menu-commentBarrage(data-solitude-action="switchCommentBarrage" title=_p('right_menu.barrage.close') heotip=_p('right_menu.barrage.close'))
                 i.solitude.fas.fa-comment
                 span.menu-commentBarrage-text= _p('right_menu.barrage.close')
-        div.rightMenu-item#menu-darkmode(onclick="sco.switchDarkMode()")
+        div.rightMenu-item#menu-darkmode(data-solitude-action="switchDarkMode")
             i.solitude.fas.fa-circle-half-stroke
             case theme.display_mode.type
                 when 'auto'
                 when 'light'
-                    span.menu-darkmode-text= _p('right_menu.light')
+                    span.menu-darkmode-text(title=_p('right_menu.light') heotip=_p('right_menu.light'))= _p('right_menu.light')
                 when 'dark'
-                    span.menu-darkmode-text= _p('right_menu.dark')
+                    span.menu-darkmode-text(title=_p('right_menu.dark') heotip=_p('right_menu.dark'))= _p('right_menu.dark')
         if theme.right_menu.translate
             div.rightMenu-item#menu-translate
                 i.solitude.fas.fa-language
                 case theme.translate.defaultEncoding
                     when 2
-                        span= _p('right_menu.chs_to_cht')
+                        span(title=_p('right_menu.chs_to_cht') heotip=_p('right_menu.chs_to_cht'))= _p('right_menu.chs_to_cht')
                     when 1
-                        span= _p('right_menu.cht_to_chs')
-div#rightmenu-mask
+                        span(title=_p('right_menu.cht_to_chs') heotip=_p('right_menu.cht_to_chs'))= _p('right_menu.cht_to_chs')
+div#rightmenu-mask

package/layout/includes/sidebar.pug

@@ -25,7 +25,7 @@ div#sidebar(style="zoom: 1;")
                             include ./widgets/sidebar/comment
         span.sidebar-menu-item-title= __('sidebar.function')
         div.sidebar-menu-item
-            span.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()")
+            span.darkmode_switchbutton.menu-child(data-solitude-action="toggleTheme")
                 i.solitude.fas.fa-circle-half-stroke
                 span= __('sidebar.darkmode')
         include ./widgets/nav/group
@@ -41,4 +41,4 @@ div#sidebar(style="zoom: 1;")
             .webinfo
                 .webinfo-item
                     .item-name= __('aside.wordcount')
-                    .item-count= totalcount(site)
+                    .item-count= totalcount(site)

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

@@ -2,7 +2,7 @@
     .card-content
         .card-info-avatar.is-center
             .top-group
-                .sayhi#sayhi(onclick="sco.changeWittyWord()")
+                .sayhi#sayhi(data-solitude-action="changeWittyWord")
         .avatar
             img(alt=_p('aside.avatar'), src=theme.aside.my_card.author.img)
             if theme.aside.my_card.author.sticker
@@ -16,5 +16,5 @@
             .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)
+                    a.social-icon(href=url_for(trim(array[0])), title=label, heotip=label)
                         i.solitude(class=array[1])

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

@@ -8,9 +8,9 @@
             a(href=url_for(tag.path))= tag.name
                 sup= tag.length
 if site.tags.length >= theme.aside.tags.limit
-    span#more-tags-btn(onclick="sco.openAllTags()")= __('aside.tagmore')
+    span#more-tags-btn(data-solitude-action="openAllTags")= __('aside.tagmore')
 else
     style.
         .card-tag-cloud::after {
             display: none !important;
-        }
+        }

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

@@ -1,6 +1,6 @@
 .bbTimeList.container#bbTimeList(class=is_home_first_page() ? '' : 'more-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)}')`)
+    i.bber-logo.solitude.fas.fa-newspaper(data-solitude-action="navigateTo" data-solitude-url=url_for(theme.brevity.page))
+    .swiper-container.swiper-no-swiping#bbtalk(tabindex="-1" data-solitude-action="navigateTo" data-solitude-url=url_for(theme.brevity.page))
         .swiper-wrapper#bber-talk
             each item, i in site.data.brevity.slice(0, 10)
                 .li-style.swiper-slide
@@ -13,4 +13,4 @@
                         i.solitude.fas.fa-video
                     else if item.link
                         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)}')`)
+    i.bber-gotobb.solitude.fas.fa-circle-chevron-right(title=_p('home.bbtime.text') data-solitude-action="navigateTo" data-solitude-url=url_for(theme.brevity.page))

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

@@ -1,16 +1,31 @@
 .category-bar-items#category-bar-items(class=is_home() ? 'home' : '')
-    .category-bar-item(class=is_home() ? 'select' : '', id="category-bar-home")
-        a(href=url_for('/'))= __('home.home')
-    .category-bar-item
-        a(href=url_for('/archives/'))= __('home.archives')
-    each item in site.categories.find({ parent: { $exists: false } }).data
-        .category-bar-item(class=select ? (select === item.name ? 'select' : '') : '', id=item.name)
-            a(href=url_for(item.path))= item.name
-div.category-bar-right
-    - let categories = site.categories.find({parent: {$exists: false}})
-    - 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.fas.fa-angles-right
-    if theme.page.categories
-        a.category-bar-more(href=url_for('/categories/'))= __('more')
+  .category-bar-item(class=is_home() ? 'select' : '', id='category-bar-home', data-default-order='0')
+    a(href=url_for('/'), title=__('home.home'), heotip=_p('tooltip.home'))
+      span.category-bar-link-icon
+        i.solitude.fas.fa-star
+      span= __('home.home')
+  .category-bar-item(
+    class=is_archive() ? 'select' : ''
+    id='archives'
+    data-default-order='1'
+  )
+    a(href=url_for('/archives/'), title=__('home.archives'), heotip=_p('tooltip.archives'))
+      span.category-bar-link-icon
+        i.solitude.fas.fa-book
+      span= __('home.archives')
+  each item, index in site.categories.find({ parent: { $exists: false } }).data
+    .category-bar-item(
+      class=select ? (select === item.name ? 'select' : '') : ''
+      id=item.name
+      data-default-order=index + 2
+    )
+      a(href=url_for(item.path), title=item.name, heotip=_p('tooltip.category').replace('${name}', item.name))= item.name
+
+- const categories = site.categories.find({ parent: { $exists: false } })
+- const wordCount = categories.map(category => category.name).join('').length
+.category-bar-more-group
+  if wordCount > 40 || categories.data.length > 10
+    button.category-bar-next#category-bar-next(type='button' data-solitude-action='scrollCategoryBarToRight' aria-label=_p('tooltip.category_next') title=_p('tooltip.category_next') heotip=_p('tooltip.category_next'))
+      i.solitude.fas.fa-angles-right
+  if theme.page.categories
+    a.category-bar-more(href=url_for('/categories/'), title=__('more'), heotip=_p('tooltip.categories'))= __('more')

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

@@ -1,8 +1,113 @@
-.recent-top-post-group#recent-top-post-group
-    .recent-post-top#recent-post-top
-        #bannerGroup
-            #banners
-                include ./banner.pug
-        if theme.hometop.recommendList.enable
-            .topGroup
-                include ./topGroup.pug
+-
+  const recommendConfig = theme.hometop.recommendList || []
+  const recommendEntries = Array.isArray(recommendConfig)
+    ? recommendConfig
+    : Array.isArray(recommendConfig.list)
+      ? recommendConfig.enable === false ? [] : recommendConfig.list
+      : recommendConfig.enable
+        ? [recommendConfig]
+        : []
+  const hasOrder = item => item.order !== undefined && item.order !== null && item.order !== '' && Number.isFinite(Number(item.order))
+  const configuredItems = recommendEntries
+    .map((item, sourceIndex) => ({ item, sourceIndex }))
+    .filter(({ item }) => item && item.enable !== false && item.title && item.url && (item.img || item.cover))
+    .sort((a, b) => {
+      const aHasOrder = hasOrder(a.item)
+      const bHasOrder = hasOrder(b.item)
+      if (aHasOrder && bHasOrder) return Number(a.item.order) - Number(b.item.order) || a.sourceIndex - b.sourceIndex
+      if (aHasOrder) return -1
+      if (bHasOrder) return 1
+      return a.sourceIndex - b.sourceIndex
+    })
+    .map(({ item }) => ({
+      title: item.title,
+      url: item.url,
+      cover: item.img || item.cover,
+      label: item.sup || item.label || '',
+      color: item.color || ''
+    }))
+  const normalizeUrl = value => String(value || '').replace(/^\/+|\/+$/g, '')
+  const configuredUrls = new Set(configuredItems.map(item => normalizeUrl(item.url)))
+  const recentCoverPosts = site.posts.sort('-date').data
+    .filter(post => post.cover && !configuredUrls.has(normalizeUrl(post.path)))
+    .slice(0, Math.max(0, 5 - configuredItems.length))
+  const postItems = recentCoverPosts.map(post => ({
+    title: post.title,
+    url: post.path,
+    cover: post.cover,
+    label: post.categories && post.categories.data.length ? post.categories.data[0].name : '',
+    color: post.banner_color || post.theme_color || ''
+  }))
+  const homeCenterItems = configuredItems.concat(postItems).slice(0, 5)
+  const fallbackCover = url_for('/img/default.avif')
+  const explicitColor = color => color && !String(color).includes('var(') ? color : ''
+  const initialColor = homeCenterItems.length ? explicitColor(homeCenterItems[0].color) || 'var(--efu-main)' : 'var(--efu-main)'
+  const initialStyle = `--current-theme:${initialColor};--current-theme-op:color-mix(in srgb, ${initialColor} 14%, transparent);--current-theme-op-deep:color-mix(in srgb, ${initialColor} 87%, transparent)`
+
+if homeCenterItems.length
+  .home-center#home_center(style=initialStyle)
+    .home-center-content
+      .home-center-left
+        .home-center-banner(data-mobile-loop='false')
+          each item, index in homeCenterItems
+            - const configuredColor = explicitColor(item.color)
+            - const itemColor = configuredColor || 'var(--efu-main)'
+            - const itemStyle = `--home-center-theme:${itemColor};--home-center-theme-op:color-mix(in srgb, ${itemColor} 14%, transparent);--home-center-theme-op-deep:color-mix(in srgb, ${itemColor} 87%, transparent)`
+            .home-center-banner-item.has-banner-cover(
+              class=index === 0 ? 'active' : ''
+              style=itemStyle
+              role='link'
+              tabindex=index === 0 ? '0' : '-1'
+              aria-hidden=index === 0 ? 'false' : 'true'
+              data-index=index
+              data-link=url_for(item.url)
+              data-title=item.title
+              data-label=item.label || ''
+              data-color=configuredColor
+            )
+              .home-center-cover
+                img.home-center-cover-img.nolazyload(
+                  src=url_for(item.cover)
+                  alt=item.title
+                  loading=index === 0 ? 'eager' : 'lazy'
+                  fetchpriority=index === 0 ? 'high' : 'auto'
+                  data-solitude-fallback=url_for(fallbackCover)
+                )
+              .home-center-mask
+
+        .home-center-title
+          a.home-center-title-link(href=url_for(homeCenterItems[0].url))= homeCenterItems[0].title
+          .home-center-title-tag
+            i.solitude.fas.fa-star
+            span= homeCenterItems[0].label || ''
+          .home-center-indicators(aria-label='推荐内容切换')
+            each item, index in homeCenterItems
+              button.home-center-indicator(
+                class=index === 0 ? 'active' : ''
+                type='button'
+                data-index=index
+                aria-label=`查看第 ${index + 1} 条推荐`
+                aria-current=index === 0 ? 'true' : 'false'
+              )
+
+      if homeCenterItems.length > 1
+        .home-center-right
+          .home-center-list
+            each item, index in homeCenterItems
+              - const itemColor = explicitColor(item.color) || 'var(--efu-main)'
+              - const itemStyle = `--item-theme:${itemColor};--item-theme-op:color-mix(in srgb, ${itemColor} 14%, transparent);--item-theme-op-deep:color-mix(in srgb, ${itemColor} 87%, transparent)`
+              .home-center-item(
+                class=index === 0 ? 'active' : ''
+                style=itemStyle
+                data-index=index
+                aria-current=index === 0 ? 'true' : 'false'
+              )
+                .home-center-item-icon
+                  img.nolazyload(
+                    src=url_for(item.cover)
+                    alt=''
+                    loading='lazy'
+                    data-solitude-fallback=url_for(fallbackCover)
+                  )
+                .home-center-item-title
+                  a(href=url_for(item.url))= item.title

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

@@ -80,8 +80,7 @@ mixin adsenseCard()
           (adsbygoogle = window.adsbygoogle || []).push({});
 
 //- 主文章项组件
-- var onclickAttr = "pjax.loadUrl('" + url_for(post.path) + "')"
-.recent-post-item(onclick=onclickAttr)
+.recent-post-item(data-solitude-action="navigateTo" data-solitude-url=url_for(post.path))
   if direction === 'column'
     +columnLayout()
   else

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

@@ -17,18 +17,14 @@ mixin todayCardContent
     .todayCard-cover.nolazyload(style=`background: url('${theme.hometop.recommendList.img}') no-repeat center /cover`)
     if filteredPosts.length > 0
         .banner-button-group
-            a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
+            a.banner-button(data-solitude-action="hideTodayCard" data-solitude-stop="true")
                 i.solitude.fas.fa-circle-plus
                 span.banner-button-text= _p('home.recommendmore')
 
 case theme.hometop.recommendList.url.startsWith('/')
     when true
-        .todayCard#todayCard(onclick=`pjax.loadUrl('${theme.hometop.recommendList.url}')`)
+        .todayCard#todayCard(data-solitude-action="navigateTo" data-solitude-url=theme.hometop.recommendList.url)
             +todayCardContent()
     when false
-        script.
-            function GoTodayCard() {
-                window.open("#{theme.hometop.recommendList.url}", "_blank");
-            }
-        .todayCard#todayCard(onclick="GoTodayCard()")
+        .todayCard#todayCard(data-solitude-action="openExternal" data-solitude-url=theme.hometop.recommendList.url)
             +todayCardContent()

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

@@ -7,7 +7,9 @@ if menu
                 .back-menu-list
                     each data, label in value
                         - var array = data.split('||')
-                        a.back-menu-item(href=url_for(trim(array[0])), title=label)
+                        - var itemUrl = trim(array[0])
+                        - var isTravelling = itemUrl === 'javascript:travelling()'
+                        a.back-menu-item(href=isTravelling ? 'javascript:void(0);' : url_for(itemUrl), data-solitude-action=isTravelling ? 'travelling' : null, data-solitude-prevent=isTravelling ? 'true' : null, title=label, heotip=label)
                             if array[1]
                                 img.nolazyload.back-menu-item-icon(src=trim(array[1]), alt=label)
-                            span.back-menu-item-text= label
+                            span.back-menu-item-text= label

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

@@ -5,16 +5,18 @@ if menu
         each value, label in menu
             .menus_item
                 if typeof value !== 'object'
-                    a.site-page(href=url_for(value))
+                    a.site-page(href=url_for(value), title=label, heotip=label)
                         span= label
                 else
-                    a.site-page(href="javascript:void(0);")
+                    a.site-page(href="javascript:void(0);", title=label, heotip=label)
                         span= label
                     ul.menus_item_child
                         each childValue, childLabel in value
                             li
                                 - var array = childValue.split('||')
-                                a.site-page.child(href=url_for(trim(array[0])))
+                                - var childUrl = trim(array[0])
+                                - var isTravelling = childUrl === 'javascript:travelling()'
+                                a.site-page.child(href=isTravelling ? 'javascript:void(0);' : url_for(childUrl), data-solitude-action=isTravelling ? 'travelling' : null, data-solitude-prevent=isTravelling ? 'true' : null, title=childLabel, heotip=childLabel)
                                     if array[1]
                                         i.solitude(class=array[1])
-                                    span= childLabel
+                                    span= childLabel

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

@@ -1,28 +1,29 @@
 - var custom = theme.nav.right.custom || []
 each item in custom
+    - const itemCommand = (item.onclick || '').replace(/\btoRandomPost\(\)/g, 'randomPost()').replace(/\btravelling\(\)/g, 'travelling()').replace(/\?\.\(/g, '(').replace(/\?\./g, '.')
     .nav-button(id=item.id)
-        a.site-page(href=url_for(item.url) || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
+        a.site-page(href=url_for(item.url) || 'javascript:void(0);', data-solitude-action=itemCommand ? 'runConfiguredAction' : null, data-solitude-value=itemCommand || null, data-solitude-prevent=itemCommand ? 'true' : null, title=item.title || item.name, heotip=item.title || item.name)
             i.solitude(class=item.icon || '')
 if theme.nav.right.random
     .nav-button#randomPost_button
-        a.site-page(onclick="toRandomPost()", title=_p('nav.randompost'), href="javascript:void(0);")
+        a.site-page(data-solitude-action="randomPost" data-solitude-prevent="true", title=_p('nav.randompost'), heotip=_p('nav.randompost'), href="javascript:void(0);")
             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'))
+        a.site-page.social-icon.search(href="javascript:void(0);", title=_p('nav.search'), heotip=_p('nav.search'))
             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);")
+        a.console_switchbutton(data-solitude-action="toggleConsole" data-solitude-prevent="true", title=_p('nav.console'), heotip=_p('nav.console'), href="javascript:void(0);")
             label
                 i.left
                 i.center
                 i.right
 if !theme.rightside.percent
-    .nav-button#nav-totop(onclick="sco.toTop()")
+    .nav-button#nav-totop(data-solitude-action="toTop" title=_p('nav.backtop') heotip=_p('nav.backtop'))
         a.totopbtn
             i.solitude.fas.fa-arrow-up
             span#percent= "0"
 #toggle-menu
     a.site-page
-        i.solitude.fas.fa-bars
+        i.solitude.fas.fa-bars

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

@@ -1,39 +1,68 @@
-- award = site.data.about.award
+- const award = site.data.about.award
+- const rewardList = Array.isArray(site.data.about.rewardList) ? site.data.about.rewardList.slice() : []
+- const sortedRewards = rewardList.sort((a, b) => new Date(b.time) - new Date(a.time))
+- const visibleRewards = sortedRewards.slice(0, 11)
+- const sum = rewardList.reduce((total, reward) => total + Number(reward.money || 0), 0)
+- const rewardConfig = theme.post && theme.post.award ? theme.post.award : {}
+- const rewardMethods = Array.isArray(rewardConfig.list) ? rewardConfig.list.filter(item => item && item.name && item.qcode) : []
+- const showRewardButton = rewardConfig.enable && rewardMethods.length > 0
+- const appreciators = rewardConfig.appreciators
 
-- var sum = 0
-if site.data.about.rewardList && site.data.about.award.enable
-    .author-content
-        .author-content-item.single.reward
-            .author-content-item-tips= _p('award.thanks')
-            span.author-content-item-title= _p('award.title')
-            .author-content-item-description
-                != award.description
-            .reward-list-all
-                each reward in site.data.about.rewardList.sort((a, b) => b.time - a.time) || []
-                    - sum += reward.money
-                    .reward-list-item
-                        .reward-list-item-name= reward.name
-                        .reward-list-bottom-group
-                            .reward-list-item-money(style="background-color:" + reward.color)
-                                if reward.icon
-                                    i.solitude(class=reward.icon)
-                                | ¥ #{reward.money}
-                            time.datetime.reward-list-item-time(datetime=moment(reward.time).format())
-                if theme.post.award.enable
-                    .post-reward
-                        .post-reward(onclick="AddRewardMask()")
-                        .reward-button(title=_p('award.tipping'))
-                            i.solitude.fas.fa-heart
-                            = _p('award.tipping')
-                        .reward-main
-                            ul.reward-all
-                                span.reward-title= theme.post.award.title
-                                ul.reward-group
-                                    - var rewards = theme.post.award.list
-                                    each reward in rewards
-                                        li.reward-item
-                                            a(href=url_for(reward.url))
-                                                img.post-qr-code-img(alt=reward.name, src=reward.qcode, style="border-color:" + reward.color)
-                                            .post-qr-code-desc= reward.name
-            .reward-list-tips
-                p= award.tips.replace('{sum}', sum.toFixed(2))
+if rewardList.length && award && award.enable
+  .author-content
+    .author-content-item.single.reward
+      .author-content-item-tips= _p('award.thanks')
+      span.author-content-item-title= _p('award.title')
+      .author-content-item-description!= award.description
+
+      if showRewardButton
+        .post-reward
+          .reward-button(
+            role='button'
+            tabindex='0'
+            title=_p('award.tipping')
+            aria-label=_p('award.tipping')
+            data-solitude-action='showReward'
+          )
+            i.solitude.fas.fa-heart(aria-hidden='true')
+            = _p('award.tipping')
+          .reward-main
+            ul.reward-all
+              span.reward-title= rewardConfig.title
+              ul.reward-group
+                each method in rewardMethods
+                  li.reward-item
+                    a(href=url_for(method.url))
+                      img.post-qr-code-img.nolazyload(
+                        alt=method.name
+                        src=method.qcode
+                        style=method.color ? 'border-color:' + method.color : null
+                      )
+                    .post-qr-code-desc= method.name
+
+      .reward-list-all
+        each reward in visibleRewards
+          - const amount = Number(reward.money || 0)
+          - const amountTier = amount >= 100 ? 'reward-list-item-money-high' : amount >= 20 ? 'reward-list-item-money-medium' : 'reward-list-item-money-low'
+          .reward-list-item(tabindex='0')
+            .reward-list-item-name(title=reward.name)= reward.name
+            .reward-list-bottom-group
+              .reward-list-item-money(
+                class=amountTier
+                style=reward.color ? 'background-color:' + reward.color : null
+              )
+                if reward.icon
+                  i.solitude(class=reward.icon aria-hidden='true')
+                | ¥ #{reward.money}
+              time.datetime.reward-list-item-time(datetime=moment(reward.time).format())= moment(reward.time).format('YYYY-MM-DD')
+
+        if appreciators
+          a.reward-list-item.reward-list-item-more(
+            href=url_for(appreciators)
+            aria-label='查看全部打赏名单'
+          )
+            span 查看全部
+            i.solitude.fas.fa-arrow-right(aria-hidden='true')
+
+      .reward-list-tips
+        p= award.tips.replace('{sum}', sum.toFixed(2))

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

@@ -10,16 +10,25 @@ if games
             .author-content-item.game(class=`game-${index}`, style=`background: url(${game.img}) no-repeat top; background-size: cover;`)
                 .card-content
                     .author-content-item-tips= game.title
-                    span.author-content-item-title= game.subtitle
+                    if game.mode
+                        .author-content-item-title
+                            span.author-content-item-title-text= game.subtitle
+                            img.mode-img(src=game.mode.img, alt=game.mode.name, title=game.mode.tip, heotip=game.mode.tip)
+                    else
+                        span.author-content-item-title= game.subtitle
                     .content-bottom
-                        if game.icon_group
+                        if game.heroes
+                            .hero-group
+                                each hero, heroIndex in game.heroes
+                                    img.hero-group-item(src=hero.img, alt=hero.name, title=`擅长英雄：${hero.name}`, heotip=`擅长英雄：${hero.name}`, style=`--index: ${heroIndex};`)
+                        else if game.icon_group
                             .icon-group
                                 each icon in game.icon_group
                                     i(style=`background-image: url(${icon})`)
                         else if game.tips_left
                             .tips= game.tips_left
                         if game.tips_right
-                            .tips= game.tips_right
+                            .tips(title=game.tips_right_tip, heotip=game.tips_right_tip)= game.tips_right
 
 if site.data.about.likes
   - const likes = site.data.about.likes

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

@@ -10,6 +10,6 @@
         if page.rightbtn
             .banner-button-group
                 - const isInternalLink = page.rightbtnlink.startsWith('/')
-                a.banner-button(onclick=isInternalLink ? `pjax.loadUrl("${page.rightbtnlink}")`: null, href=isInternalLink ? null : url_for(page.rightbtnlink), target=isInternalLink ? null : "_blank")
+                a.banner-button(data-solitude-action=isInternalLink ? "navigateTo" : null, data-solitude-url=isInternalLink ? page.rightbtnlink : null, href=isInternalLink ? null : url_for(page.rightbtnlink), target=isInternalLink ? null : "_blank")
                     i.solitude.fas.fa-circle-chevron-right
                     span.banner-button-text= page.rightbtn

package/layout/includes/widgets/page/kit/content.pug

@@ -11,7 +11,7 @@
                             .equipment-item-content-item-cover
                                 img.equipment-item-content-item-image(src=item.image, alt=item.name)
                             .equipment-item-content-item-info
-                                .equipment-item-content-item-name(onclick='utils.copy("' + item.name + '")')= item.name
+                                .equipment-item-content-item-name(data-solitude-action='copy' data-solitude-value=item.name)= item.name
                                 .equipment-item-content-item-specification= item.specification
                                 .equipment-item-content-item-description= item.description
                                 .equipment-item-content-item-toolbar
@@ -21,5 +21,5 @@
                                         else
                                             a.equipment-item-content-item-link(href=item.link) 查看文章
                                     if theme.comment.use
-                                        a.bber-reply(onclick=`sco.toTalk('${item.description}')`)
+                                        a.bber-reply(data-solitude-action="toTalk" data-solitude-value=item.description)
                                             i.solitude.fas.fa-comment(style="font-size: 1rem;")