hexo-theme-solitude 1.12.0 → 1.12.1

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

@@ -15,6 +15,52 @@
                     a.reward-link-button(href=url_for(theme.post.rss))
                         i.solitude.st-plant-fill
                         = _p('footer.rss')
+    if theme.post.share.enable
+        .social-share
+            -  const path = config.url + url_for(page.path);
+            -  const encodedPath = encodeURIComponent(path);
+            -  const encodedTitle = encodeURIComponent(page.title);
+            -  const encodedDescription = encodeURIComponent(page.description);
+            -  const encodedIcon = encodeURIComponent(page.cover || theme.site.icon);
+            each item in theme.post.share.list || []
+                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
+                    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
+                    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
+                    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
+                    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
+                    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
+                    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
+                    when 'link'
+                        .social-share-ico.icon-link(onclick=`utils.copy("${path}")` title=_p('post.share.link'))
+                            i.solitude.st-links-line
+                    when 'qrcode'
+                        .social-share-ico.icon-qrcode(title=_p('post.share.qrcode'))
+                            i.solitude.st-qr-code-fill
+                            .share-main
+                                .share-main-all
+                                    #qrcode
+                                    .reward-dec=_p('post.share.qrcode')
+                            script(pjax).
+                                typeof QRCode === 'function' && new QRCode(document.getElementById("qrcode"), '!{path}');
+                                window.addEventListener('DOMContentLoaded', () => {
+                                    new QRCode(document.getElementById("qrcode"), '!{path}');
+                                });
+
     if copyright.enable || page.copyright
         .post-copyright__notice
             span.post-copyright-info

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

@@ -78,7 +78,7 @@
                                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
                                     i.solitude.st-loading-line
                             when 'Artalk'
-                                span#ArtalkCount.artalk-count
+                                span.artalk-count
                                     i.solitude.st-loading-line
 
 include ./wave

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

@@ -3,23 +3,23 @@ nav.needEndHide.pagination-post#pagination
         .prev-post.pull-left
             a(href=url_for(page.prev.path))
                 .pagination-info
-                    .label 上一篇
+                    .label=_p('post.nav.prev')
                     .prev_info= page.prev.title
         .next-post.pull-right
             a(href=url_for(page.next.path))
                 .pagination-info
-                    .label 下一篇
+                    .label=_p('post.nav.next')
                     .next_info= page.next.title
     else
         if !page.prev && page.next
             .next-post.pull-full
                 a(href=url_for(page.next.path))
                     div.pagination-info
-                        .label 下一篇
+                        .label=_p('post.nav.next')
                         .next_info= page.next.title
         if !page.next && page.prev
             .prev-post.pull-full
                 a(href=url_for(page.prev.path))
                     .pagination-info
-                        .label 上一篇
+                        .label=_p('post.nav.prev')
                         .prev_info= page.prev.title

package/layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -60,6 +60,7 @@ script.
             }
         }
         const newestCommentInit = () => {
+            if (!document.querySelector('.card-recent-comment')) return
             const data = utils.saveToLocal.get('twikoo-newest-comment')
             data ? generateHtml(data) : getComment()
         }

package/layout/includes/widgets/third-party/news-comment/valine.pug

@@ -21,6 +21,7 @@ script.
 
         const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
+            if (!document.querySelector('.card-recent-comment')) return
             const data = utils.saveToLocal.get('valine-newest-comment')
             if (data) {
                 generateHtml(data)

package/layout/includes/widgets/third-party/news-comment/waline.pug

@@ -20,6 +20,7 @@ script.
 
         const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
+            if (!document.querySelector('.card-recent-comment')) return
             const data = utils.saveToLocal.get('waline-newest-comment')
             if (data) {
                 generateHtml(data)

package/layout/post.pug

@@ -15,28 +15,6 @@ block content
                                 span.tags-punctuation
                                 | #{data.name}
                                 span.tagsPageCount #{data.length}
-                .social-share
-                    -  const path = config.url + url_for(page.path);
-                    -  const encodedPath = encodeURIComponent(path);
-                    -  const encodedTitle = encodeURIComponent(page.title);
-                    -  const encodedDescription = encodeURIComponent(page.description);
-                    -  const encodedIcon = encodeURIComponent(page.cover || theme.site.icon);
-                    each item in theme.post.share.list || []
-                        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="QQ")
-                            when 'weibo'
-                                a.social-share-ico.icon-weibo(href=`http://service.weibo.com/share/share.php?url=${encodedPath}&title=${encodedTitle}&pic=${encodedIcon}` title="Weibo")
-                            when 'telegram'
-                                a.social-share-ico.icon-telegram(href=`https://t.me/share/url?url=${encodedPath}&text=${encodedTitle}` title="Telegram")
-                            when 'whatsapp'
-                                a.social-share-ico.icon-whatsapp(href=`https://api.whatsapp.com/send?text=${encodedTitle} ${encodedPath}` title="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="LinkedIn")
-                            when 'facebook'
-                                a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title="Facebook")
-                            when 'twitter'
-                                a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title="Twitter")
             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/package.json

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

package/plugins.yml

@@ -114,4 +114,9 @@ mermaid_js:
 blueimp_md5:
   name: blueimp-md5
   file: js/md5.min.js
-  version: 2.19.0
+  version: 2.19.0
+qrcode:
+  name: qrcodejs
+  file: qrcode.min.js
+  version: 1.0.0
+  other_name: qrcodejs

package/scripts/filter/post_image.js

@@ -0,0 +1,13 @@
+'use strict'
+
+hexo.extend.filter.register('before_post_render', data => {
+  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
+  let { cover: coverVal } = data
+
+  // Add path to top_img and cover if post_asset_folder is enabled
+  if (hexo.config.post_asset_folder) {
+    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
+  }
+  
+  return data
+})

package/scripts/helper/page.js

@@ -1,5 +1,5 @@
 "use strict";
-const { stripHTML, escapeHTML } = require('hexo-util')
+const { stripHTML, escapeHTML, prettyUrls } = require("hexo-util");
 hexo.extend.helper.register('page_description', function () {
     const { config, page } = this
     let description =  page.description || page.content || page.title || config.description
@@ -10,4 +10,8 @@ hexo.extend.helper.register('page_description', function () {
         ).replace(/\n/g, ' ').replace(/\s+/g, ' ');
         return description
     }
-})
+})
+
+hexo.extend.helper.register("urlNoIndex", function (url = null) {
+    return prettyUrls(url || this.url, { trailing_index: false, trailing_html: true });
+});

package/source/css/_highlight/color.styl

@@ -1,134 +1,72 @@
 $highlight_color = hexo-config('highlight.color')
 
 if $highlight_color == "default"
-  $highlight-comment = #969896
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "dark"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "funky"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #FFCB6B
-  $highlight-yellow = #C3E88D
-  $highlight-green = #89DDFF
-  $highlight-aqua = #82AAFF
-  $highlight-blue = #C792EA
-  $highlight-purple = #FF5370
-  $highlight-deletion = #F07178
-  $highlight-addition = #C3E88D
-else if $highlight_color == "okaidia"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #FFCB6B
-  $highlight-yellow = #C3E88D
-  $highlight-green = #89DDFF
-  $highlight-aqua = #82AAFF
-  $highlight-blue = #C792EA
-  $highlight-purple = #FF5370
-  $highlight-deletion = #F07178
-  $highlight-addition = #C3E88D
-else if $highlight_color == "tomorrow"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "twilight"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "darcula"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "material"
-  $highlight-comment = #546E7A
-  $highlight-red = #FF5370
-  $highlight-orange = #FFCB6B
-  $highlight-yellow = #C3E88D
-  $highlight-green = #89DDFF
-  $highlight-aqua = #82AAFF
-  $highlight-blue = #C792EA
-  $highlight-purple = #FF5370
-  $highlight-deletion = #F07178
-  $highlight-addition = #C3E88D
-else if $highlight_color == "solarized-light"
-  $highlight-comment = #93A1A1
-  $highlight-red = #DC322F
-  $highlight-orange = #CB4B16
-  $highlight-yellow = #B58900
-  $highlight-green = #859900
-  $highlight-aqua = #2AA198
-  $highlight-blue = #268BD2
-  $highlight-purple = #6C71C4
-  $highlight-deletion = #D33682
-  $highlight-addition = #859900
-else if $highlight_color == "solarized-dark"
-  $highlight-comment = #657B83
-  $highlight-red = #DC322F
-  $highlight-orange = #CB4B16
-  $highlight-yellow = #B58900
-  $highlight-green = #859900
-  $highlight-aqua = #2AA198
-  $highlight-blue = #268BD2
-  $highlight-purple = #6C71C4
-  $highlight-deletion = #D33682
-  $highlight-addition = #859900
-else if $highlight_color == "github"
-  $highlight-comment = #969896
-  $highlight-red = #D73A49
-  $highlight-orange = #BD2C00
-  $highlight-yellow = #E5C07B
-  $highlight-green = #28A745
-  $highlight-aqua = #00A9C0
-  $highlight-blue = #0366D6
-  $highlight-purple = #6F42C1
-  $highlight-deletion = #D73A49
-  $highlight-addition = #28A745
-else
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
+  $highlight-variable-dark = #569CD6
+  $highlight-number-dark = #B5CEA8
+  $highlight-string-dark = #CE9178
+  $highlight-title-dark = #DCDCAA
+  $highlight-emphasis-dark = #6A9955
+  $highlight-variable-light = #0000FF
+  $highlight-number-light = #098658
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = $highlight-string-dark
+  $highlight-comment-light = $highlight-string-light
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b
+else if $highlight_color == "solidity"
+  $highlight-variable-dark = #D74BDE
+  $highlight-number-dark = #8DA1A0
+  $highlight-string-dark = #5B876D
+  $highlight-title-dark = #D74BDE
+  $highlight-emphasis-dark = #BA9C23
+  $highlight-variable-light = #0000FF
+  $highlight-number-light = #098658
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = $highlight-string-dark
+  $highlight-comment-light = $highlight-string-light
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b
+else if $highlight_color == "dracula"
+  $highlight-variable-dark = #FF79C6
+  $highlight-number-dark = #BD93F9
+  $highlight-string-dark = #F1FA8C
+  $highlight-title-dark = #50FA7B
+  $highlight-emphasis-dark = #8BE9FD
+  $highlight-variable-light = #FF79C6
+  $highlight-number-light = #BD93F9
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = #6272A4
+  $highlight-comment-light = #6272A4
+  $highlight-important-dark = #BD93F9
+  $highlight-important-light = #BD93F9
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b
+else 
+  $highlight-variable-dark = #569CD6
+  $highlight-number-dark = #B5CEA8
+  $highlight-string-dark = #CE9178
+  $highlight-title-dark = #DCDCAA
+  $highlight-emphasis-dark = #6A9955
+  $highlight-variable-light = #0000FF
+  $highlight-number-light = #098658
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = $highlight-string-dark
+  $highlight-comment-light = $highlight-string-light
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b

package/source/css/_highlight/highlight/diff.styl

@@ -5,75 +5,47 @@ figure.highlight
     background var(--efu-hl-bg)
     border-radius 6px
     display initial
-  pre .deletion
-    color $highlight-deletion
 
-  pre .addition
-    color $highlight-addition
+  .keyword
+  .attr
+  .variable
+  .literal
+  .property
+    color $highlight-variable-light
 
-  pre .meta
-    color $highlight-purple
+  .number
+    color $highlight-number-light
 
-  pre
-    .comment
-      color $highlight-comment
+  .string
+    color $highlight-string-light
 
-    .variable,
-    .attribute,
-    .regexp,
-    .ruby .constant,
-    .xml .tag .title,
-    .xml .pi,
-    .xml .doctype,
-    .html .doctype,
-    .css .id,
-    .tag .name,
-    .css .class,
-    .css .pseudo
-      color $highlight-red
+  .built_in
+  .title
+  .params
+  .name
+    color $highlight-title-light
 
-    .tag
-      color $highlight-aqua
+  .emphasis
+    color $highlight-emphasis-light
 
-    .number,
-    .preprocessor,
-    .literal,
-    .params,
-    .constant,
-    .command
-      color $highlight-orange
+  [data-theme=dark] &  
+    .keyword
+    .attr
+    .variable
+    .property
+      color $highlight-variable-dark
 
-    .built_in
-      color $highlight-yellow
-
-    .ruby .class .title,
-    .css .rules .attribute,
-    .string,
-    .value,
-    .inheritance,
-    .header,
-    .ruby .symbol,
-    .xml .cdata,
-    .special,
-    .number,
-    .formula
-      color $highlight-green
+    .number
+      color $highlight-number-dark
 
-    .keyword,
-    .title,
-    .css .hexcolor
-      color: $highlight-aqua
+    .string
+      color $highlight-string-dark
 
-    .function,
-    .python .decorator,
-    .python .title,
-    .ruby .function .title,
-    .ruby .title .keyword,
-    .perl .sub,
-    .javascript .title,
-    .coffeescript .title
-      color $highlight-blue
+    .built_in
+    .built_in
+    .title
+    .params
+      color $highlight-title-dark
 
-    .tag .attr,
-    .javascript .function
-      color $highlight-purple
+    .emphasis
+      color $highlight-emphasis-dark

package/source/css/_highlight/prismjs/diff.styl

@@ -1,79 +1,80 @@
 pre[class*='language-']
-  .token
-    &.function,
-    &.punctuation
-     color $highlight-blue
 
-  .token.comment,
-  .token.prolog,
-  .token.doctype,
-  .token.cdata
-    color $highlight-comment
+  .keyword
+  .function
+    color $highlight-variable-light
 
-  .token.namespace
-    opacity: .7
+  .operator
+    color $highlight-variable-light
 
-  .token.operator,
-  .token.boolean,
-  .token.number
-    color: $highlight-orange
+  .number
+    color $highlight-number-light
 
-  .token.property
-    color: $highlight-yellow
+  .property
+  .class-name
+  .title
+    color $highlight-title-light
 
-  .token.tag
-    color: $highlight-blue
+  .string
+    color $highlight-string-light
+ 
+  .parameter
+    color $highlight-parameter-light
 
-  .token.string
-    color: $highlight-green
+  .blockquote
+    cikir $highlight-emphasis-light
 
-  .token.selector
-    color: $highlight-deletion
+  .comment
+    color $highlight-comment-light
 
-  .token.attr-name
-    color: $highlight-orange
+  .atrule
+    color $highlight-emphasis-light
 
-  .token.entity,
-  .token.url,
-  .language-css .token.string,
-  .style .token.string
-    color: $highlight-aqua
+  .boolean
+    color $highlight-important-light
 
-  .token.attr-value,
-  .token.keyword,
-  .token.control,
-  .token.directive,
-  .token.unit
-    color: $highlight-yellow
+  .deleted
+    color $highlight-deleted
 
-  .token.statement,
-  .token.regex,
-  .token.atrule
-    color: $highlight-aqua
+  .inserted
+    color $highlight-inserted
 
-  .token.placeholder,
-  .token.variable
-    color: $highlight-blue
+  [data-theme='dark'] &
+    .keyword
+    .function
+      color $highlight-variable-dark
 
-  .token.deleted
-    color: var(--efu-red)
+    .operator
+      color $highlight-variable-dark
 
-  .token.inserted
-    color: var(--efu-green)
+    .number
+      color $highlight-number-dark
 
-  .token.italic
-    font-style: italic
+    .property
+    .class-name
+    .title
+      color $highlight-title-dark
 
-  .token.important,
-  .token.bold
-    font-weight: bold
+    .string
+      color $highlight-string-dark
+      
+    .parameter
+      color $highlight-parameter-dark
 
-  .token.important
-    color: $highlight-orange
+    .blockquote
+      color $highlight-emphasis-dark
 
-  .token.entity
-    cursor: help
+    .comment
+      color $highlight-comment-dark
 
-  pre > code.highlight
-    outline: .4em solid $highlight-orange
-    outline-offset: .4em
+    .atrule
+      color $highlight-emphasis-dark
+
+    .boolean
+      color $highlight-important-dark
+
+    .deleted
+      color $highlight-deleted
+
+    .inserted
+      color $highlight-inserted