hexo-theme-shokax 0.4.4 → 0.4.6-beta1

package/layout/_mixin/postmeta.pug

@@ -1,29 +1,29 @@
-mixin PMRender(item, full)
-    - full ||= false
-    div(class="meta")
-        - var create_title = __('post.created') + __('symbol.colon') + full_date(item.date)
-        span(class="item" title=create_title)
-            span(class="icon")
-                i(class="ic i-calendar")
-            if full
-                span(class="text")
-                    != __('post.posted')
-            time(itemprop="dateCreated datePublished" datetime=moment(item.date).format())
-                != date(item.date)
-        if theme.post.count
-            span(class="item" title=__('symbols_count_time.count'))
-                span(class="icon")
-                    i(class="ic i-pen")
-                if full
-                    span(class="text")
-                        != __('symbols_count_time.count')
-                span= symbolsCount(item)
-                span(class="text")
-                    != __('symbols_count_time.word')
-        span(class="item" title=__('symbols_count_time.time'))
-            span(class="icon")
-                i(class="ic i-clock")
-            if full
-                span(class="text")
-                    != __('symbols_count_time.time')
-            span= symbolsTime(item, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes'))
+mixin PMRender(item, full)
+    - full ||= false
+    div(class="meta")
+        - var create_title = __('post.created') + __('symbol.colon') + full_date(item.date)
+        span(class="item" title=create_title)
+            span(class="icon")
+                i(class="ic i-calendar")
+            if full
+                span(class="text")
+                    != __('post.posted')
+            time(itemprop="dateCreated datePublished" datetime=moment(item.date).format())
+                != date(item.date)
+        if theme.post.count
+            span(class="item" title=__('symbols_count_time.count'))
+                span(class="icon")
+                    i(class="ic i-pen")
+                if full
+                    span(class="text")
+                        != __('symbols_count_time.count')
+                span= symbolsCount(item)
+                span(class="text")
+                    != __('symbols_count_time.word')
+        span(class="item" title=__('symbols_count_time.time'))
+            span(class="icon")
+                i(class="ic i-clock")
+            if full
+                span(class="text")
+                    != __('symbols_count_time.time')
+            span= symbolsTime(item, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes'))

package/layout/_mixin/segment.pug

@@ -1,35 +1,35 @@
-include postmeta.pug
-
-mixin SMRender(item, lazy)
-    - var link1 = item.link || item.path
-    - var gradient = theme?.experiments?.gradient
-    if item.link
-        - var postTitleIcon = '<i class="ic i-link-alt"></i>'
-    - var postText = item.title || item.link || __('post.untitled')
-    article(class="item")
-        if gradient
-            div(class="cover" style=`background: linear-gradient(to bottom right, ${random_color()}, ${random_color()});`)
-        else
-            div(class="cover")
-                if lazy
-                    != _url(link1, '<img loading="lazy" decoding="async" data-src="'+ _cover(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
-                else
-                    != _url(link1, '<img loading="eager" decoding="async" src="'+ _cover(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
-        div(class="info")
-            +PMRender(item)
-            h3
-                != _url(link1, postText + (postTitleIcon || ''), {itemprop: 'url', title: postText})
-            div(class="excerpt")
-                if item.description
-                    != item.description
-                else if item.excerpt
-                    != item.excerpt
-                else
-                    != _truncate(escape_html(_striptags(item.content)),300)
-            if item.categories.length > 0
-                div(class="meta footer")
-                    span
-                        - var lastcat = item.categories.last()
-                        != _url(lastcat.path, '<i class="ic i-flag"></i>' + lastcat.name, {itemprop: 'url', title: lastcat.name})
-            != _url(link1, 'more...', {itemprop: 'url', title: postText, class: 'btn'})
-
+include postmeta.pug
+
+mixin SMRender(item, lazy)
+    - var link1 = item.link || item.path
+    - var gradient = theme?.experiments?.gradient
+    if item.link
+        - var postTitleIcon = '<i class="ic i-link-alt"></i>'
+    - var postText = item.title || item.link || __('post.untitled')
+    article(class="item")
+        if gradient
+            div(class="cover" style=`background: linear-gradient(to bottom right, ${random_color()}, ${random_color()});`)
+        else
+            div(class="cover")
+                if lazy
+                    != _url(link1, '<img loading="lazy" decoding="async" data-src="'+ _cover(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
+                else
+                    != _url(link1, '<img loading="eager" decoding="async" src="'+ _cover(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
+        div(class="info")
+            +PMRender(item)
+            h3
+                != _url(link1, postText + (postTitleIcon || ''), {itemprop: 'url', title: postText})
+            div(class="excerpt")
+                if item.description
+                    != item.description
+                else if item.excerpt
+                    != item.excerpt
+                else
+                    != _truncate(escape_html(_striptags(item.content)),300)
+            if item.categories.length > 0
+                div(class="meta footer")
+                    span
+                        - var lastcat = item.categories.last()
+                        != _url(lastcat.path, '<i class="ic i-flag"></i>' + lastcat.name, {itemprop: 'url', title: lastcat.name})
+            != _url(link1, 'more...', {itemprop: 'url', title: postText, class: 'btn'})
+

package/layout/_mixin/sidebar.pug

@@ -1,40 +1,40 @@
-mixin sidebarRender(display_toc)
-    - var related = _category_posts(page)
-    if page && page.prev
-        -   var prevlink = page?.prev_link
-        if !prevlink && is_home()
-            if page.prev === 1
-                - prevlink = '/'
-            else
-                - prevlink = `/page/${page.prev}/`
-        if is_page() || is_post()
-            - prevlink = page.prev.path
-    if page && page.next
-        - var nextlink = page?.next_link
-        if is_page() || is_post()
-            - nextlink = page.next.path
-    div(class="inner")
-        div(class="panels")
-            div(class="inner")
-                div(class="contents panel pjax" data-title=__('sidebar.toc'))
-                    if display_toc
-                        != toc(page.content)
-
-                div(class="related panel pjax" data-title=__('sidebar.related'))
-                    if related
-                        ul
-                            != related
-                div(class="overview panel" data-title=__('sidebar.overview'))
-                    != partial('_partials/sidebar/overview.pug', {}, {cache: true})
-        ul(id="quick")
-            li(class="prev pjax")
-                if prevlink
-                    != _url(prevlink, '<i class="ic i-chevron-left"></i>', {rel: 'prev', title: __('post.prev')})
-            li(class="up")
-                i(class="ic i-arrow-up")
-            li(class="down")
-                i(class="ic i-arrow-down")
-            li(class="next pjax")
-                if nextlink
-                    != _url(nextlink, '<i class="ic i-chevron-right"></i>', {rel: 'next', title: __('post.next')})
-            li(class="percent")
+mixin sidebarRender(display_toc)
+    - var related = _category_posts(page)
+    if page && page.prev
+        -   var prevlink = page?.prev_link
+        if !prevlink && is_home()
+            if page.prev === 1
+                - prevlink = '/'
+            else
+                - prevlink = `/page/${page.prev}/`
+        if is_page() || is_post()
+            - prevlink = page.prev.path
+    if page && page.next
+        - var nextlink = page?.next_link
+        if is_page() || is_post()
+            - nextlink = page.next.path
+    div(class="inner")
+        div(class="panels")
+            div(class="inner")
+                div(class="contents panel pjax" data-title=__('sidebar.toc'))
+                    if display_toc
+                        != toc(page.content)
+
+                div(class="related panel pjax" data-title=__('sidebar.related'))
+                    if related
+                        ul
+                            != related
+                div(class="overview panel" data-title=__('sidebar.overview'))
+                    != partial('_partials/sidebar/overview.pug', {}, {cache: true})
+        ul(id="quick")
+            li(class="prev pjax")
+                if prevlink
+                    != _url(prevlink, '<i class="ic i-chevron-left"></i>', {rel: 'prev', title: __('post.prev')})
+            li(class="up")
+                i(class="ic i-arrow-up")
+            li(class="down")
+                i(class="ic i-arrow-down")
+            li(class="next pjax")
+                if nextlink
+                    != _url(nextlink, '<i class="ic i-chevron-right"></i>', {rel: 'next', title: __('post.next')})
+            li(class="percent")

package/layout/_mixin/widgets.pug

@@ -1,28 +1,28 @@
-mixin field(item)
-    if item.link
-        - var postTitleIcon = '<i class="ic i-link-alt"></i>'
-    li(class="item")
-        +BCRender(item, false)
-        - var postText = item.title || item.link || __('post.untitled')
-        - var link1 = item.link || item.path
-        span
-            != _url(link1, postText + (postTitleIcon || ''))
-
-mixin WRender(item)
-    - var tk = theme?.twikoo?.enable
-    - var waline = theme.waline.enable
-    if theme.widgets.random_posts
-        div(class="rpost pjax")
-            h2
-                != __('index.random_posts')
-            ul
-                - var posts = site.posts.shuffle().limit(10).toArray()
-                each item in posts
-                    +field(item)
-    if theme.widgets.recent_comments
-        div(class="rpost pjax")
-            h2
-                != __('index.recent_comments')
-            if tk || waline
-                ul(class="leancloud-recent-comment" id="new-comment")
-
+mixin field(item)
+    if item.link
+        - var postTitleIcon = '<i class="ic i-link-alt"></i>'
+    li(class="item")
+        +BCRender(item, false)
+        - var postText = item.title || item.link || __('post.untitled')
+        - var link1 = item.link || item.path
+        span
+            != _url(link1, postText + (postTitleIcon || ''))
+
+mixin WRender(item)
+    - var tk = theme?.twikoo?.enable
+    - var waline = theme.waline.enable
+    if theme.widgets.random_posts
+        div(class="rpost pjax")
+            h2
+                != __('index.random_posts')
+            ul
+                - var posts = site.posts.shuffle().limit(10).toArray()
+                each item in posts
+                    +field(item)
+    if theme.widgets.recent_comments
+        div(class="rpost pjax")
+            h2
+                != __('index.recent_comments')
+            if tk || waline
+                ul(class="leancloud-recent-comment" id="new-comment")
+

package/layout/_partials/footer.pug

@@ -1,43 +1,43 @@
-div(class="status")
-    div(class="copyright")
-        - var copyright_year = date(null, 'YYYY')
-        if theme.footer.since && theme.footer.since !== copyright_year
-            != `© ${theme.footer.since} -`
-        span(itemprop="copyrightYear")
-            != copyright_year
-        span(class="with-love")
-            i(class=`ic i-${ theme.footer.icon.name }`)
-        span(class="author" itemprop="copyrightHolder")
-            != `${author} @ ${ alternate?alternate:title}`
-    if theme.footer.count
-        div(class="count")
-            span(class="post-meta-item-icon")
-                i(class="ic i-chart-area")
-            span(title=__('symbols_count_time.count_total'))
-                != `${ symbolsCountTotal(site) } ${__('symbols_count_time.word')}`
-            span(class="post-meta-divider")
-                != " | "
-            span(class="post-meta-item-icon")
-                i(class="ic i-coffee")
-            span(title=__('symbols_count_time.time_total'))
-                != symbolsTimeTotal(site, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes'))
-            //- span(id="timeDate")
-            //- span(id="times")
-    if theme.footer.powered
-        div(class="powered-by")
-            != __('footer.powered', _url('https://hexo.io', 'Hexo') + ' & Theme.' + _url('https://github.com/theme-shoka-x/hexo-theme-shokaX/', 'ShokaX'))
-    if theme.footer.icp.enable
-        br
-        span(style="display:inline;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:var(--grey-5);")
-            a(href="https://beian.miit.gov.cn")
-                != theme.footer.icp.icpnumber
-            - var beianN = theme.footer.icp?.beian, RC=theme.footer.icp?.recordcode
-            if beianN && RC
-                br
-                a(target="_blank" href=`https://beian.mps.gov.cn/#/query/webSearch?code=${RC}`)
-                    img(loading="lazy" decoding="async" data-src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20" alt="备案")
-                    != beianN
-    != shokax_inject('status')
-
-!= shokax_inject('footer')
-
+div(class="status")
+    div(class="copyright")
+        - var copyright_year = date(null, 'YYYY')
+        if theme.footer.since && theme.footer.since !== copyright_year
+            != `© ${theme.footer.since} -`
+        span(itemprop="copyrightYear")
+            != copyright_year
+        span(class="with-love")
+            i(class=`ic i-${ theme.footer.icon.name }`)
+        span(class="author" itemprop="copyrightHolder")
+            != `${author} @ ${ alternate?alternate:title}`
+    if theme.footer.count
+        div(class="count")
+            span(class="post-meta-item-icon")
+                i(class="ic i-chart-area")
+            span(title=__('symbols_count_time.count_total'))
+                != `${ symbolsCountTotal(site) } ${__('symbols_count_time.word')}`
+            span(class="post-meta-divider")
+                != " | "
+            span(class="post-meta-item-icon")
+                i(class="ic i-coffee")
+            span(title=__('symbols_count_time.time_total'))
+                != symbolsTimeTotal(site, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes'))
+            //- span(id="timeDate")
+            //- span(id="times")
+    if theme.footer.powered
+        div(class="powered-by")
+            != __('footer.powered', _url('https://hexo.io', 'Hexo') + ' & Theme.' + _url('https://github.com/theme-shoka-x/hexo-theme-shokaX/', 'ShokaX'))
+    if theme.footer.icp.enable
+        br
+        span(style="display:inline;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:var(--grey-5);")
+            a(href="https://beian.miit.gov.cn")
+                != theme.footer.icp.icpnumber
+            - var beianN = theme.footer.icp?.beian, RC=theme.footer.icp?.recordcode
+            if beianN && RC
+                br
+                a(target="_blank" href=`https://beian.mps.gov.cn/#/query/webSearch?code=${RC}`)
+                    img(loading="lazy" decoding="async" data-src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20" alt="备案")
+                    != beianN
+    != shokax_inject('status')
+
+!= shokax_inject('footer')
+

package/layout/_partials/head/head.pug

@@ -1,56 +1,55 @@
-- var msValidate = theme?.seo?.bing,googleValid = theme?.seo?.google
-- var yandexValid = theme?.seo?.yandex,baiduValid = theme?.seo?.baidu
-- var siteTitle = config.title,noBaiduT = theme?.seo?.disable_baidu_transformation
-- var feedLink = full_url_for("/feed.json")
-- var tk= theme?.twikoo?.enable
-- var wl = theme.waline.enable
-meta(charset="UTF-8")
-meta(name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2")
-meta(name="theme-color" content="#222")
-
-meta(http-equiv="X-UA-COMPATIBLE" content="IE=edge,chrome=1")
-meta(name="renderer" content="webkit")
-link(rel="icon" type="image/ico" sizes="32x32" href=url_for(theme.statics +  theme.assets + theme.icon.favicon))
-if theme.icon.apple_touch_icon
-    link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.statics +  theme.assets + theme.icon.apple_touch_icon))
-
-if msValidate
-    meta(name="msvalidate.01" content=msValidate)
-if googleValid
-    meta(name="google-site-verification" content=googleValid)
-if yandexValid
-    meta(name="yandex-verification" content=yandexValid)
-if baiduValid
-    meta(name="baidu-site-verification" content=baiduValid)
-if noBaiduT
-    meta(http-equiv="Cache-Control" content="no-transform")
-    meta(http-equiv="Cache-Control" content="no-siteapp")
-
-!= feed_tag('rss.xml')
-!= feed_tag('atom.xml')
-link(rel="alternate" type="application/json" title=siteTitle href=feedLink)
-
-- var prelinks = theme.performance.preConnect || []
-each prelink in prelinks
-    link(rel="preconnect" href=prelink)
-
-- var dnslinks = theme.performance.dnsPrefetch || []
-each dnsLink in dnslinks
-    link(rel="dns-prefetch" href=dnsLink)
-
-- var fontConfig = theme.font?.loadFromGoogle
-if fontConfig
-    != _vendor_font()
-!= _css('app.css')
-!= preloadjs()
-
-include pwa.pug
-if wl
-    link(rel="stylesheet" href="https://npm.webcache.cn/@waline/client@3.0.0-alpha.11/dist/waline.css" media="none" onload="this.media='all'")
-
-- var qw = theme?.qweather?.enable
-if qw
-    style.
-        img[data-v-7d48daab] {
-            max-width: 2em !important;
-        }
+- var msValidate = theme?.seo?.bing,googleValid = theme?.seo?.google
+- var yandexValid = theme?.seo?.yandex,baiduValid = theme?.seo?.baidu
+- var siteTitle = config.title,noBaiduT = theme?.seo?.disable_baidu_transformation
+- var feedLink = full_url_for("/feed.json")
+- var tk= theme?.twikoo?.enable
+- var wl = theme.waline.enable
+meta(charset="UTF-8")
+meta(name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2")
+meta(name="theme-color" content="#222")
+
+meta(http-equiv="X-UA-COMPATIBLE" content="IE=edge,chrome=1")
+meta(name="renderer" content="webkit")
+link(rel="icon" type="image/ico" sizes="32x32" href=url_for(theme.statics +  theme.assets + theme.icon.favicon))
+if theme.icon.apple_touch_icon
+    link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.statics +  theme.assets + theme.icon.apple_touch_icon))
+
+if msValidate
+    meta(name="msvalidate.01" content=msValidate)
+if googleValid
+    meta(name="google-site-verification" content=googleValid)
+if yandexValid
+    meta(name="yandex-verification" content=yandexValid)
+if baiduValid
+    meta(name="baidu-site-verification" content=baiduValid)
+if noBaiduT
+    meta(http-equiv="Cache-Control" content="no-transform")
+    meta(http-equiv="Cache-Control" content="no-siteapp")
+
+!= feed_tag('rss.xml')
+!= feed_tag('atom.xml')
+link(rel="alternate" type="application/json" title=siteTitle href=feedLink)
+
+- var prelinks = theme.performance.preConnect || []
+each prelink in prelinks
+    link(rel="preconnect" href=prelink)
+
+- var dnslinks = theme.performance.dnsPrefetch || []
+each dnsLink in dnslinks
+    link(rel="dns-prefetch" href=dnsLink)
+
+- var fontConfig = theme.font?.loadFromGoogle
+if fontConfig
+    != _vendor_font()
+!= _css('app.css')
+!= preloadjs()
+!= load_async_css()
+
+include pwa.pug
+
+- var qw = theme?.qweather?.enable
+if qw
+    style.
+        img[data-v-7d48daab] {
+            max-width: 2em !important;
+        }

package/layout/_partials/head/head_com.pug

@@ -1,24 +1,24 @@
-- var keywords='',tmp=page?.tags?.toArray()
-if tmp
-    each tag,index in tmp
-        -   keywords += tag.name
-        -   index++
-        -   if (index < tmp.length) keywords += ','
-if page.keywords
-    meta(name="keywords" content=page.keywords)
-else if page.tags && page.tags.length
-    meta(name="keywords" content=keywords)
-else if config.keywords
-    meta(name="keywords" content=config.keywords)
-
-if page.description
-    meta(name="description" content=page.description)
-else if page.excerpt
-    meta(name="description" content=page.excerpt)
-else if config.description
-    meta(name="description" content=config.description)
-
-!= canonical()
-
-if theme.open_graph
-    != open_graph(theme.open_graph)
+- var keywords='',tmp=page?.tags?.toArray()
+if tmp
+    each tag,index in tmp
+        -   keywords += tag.name
+        -   index++
+        -   if (index < tmp.length) keywords += ','
+if page.keywords
+    meta(name="keywords" content=page.keywords)
+else if page.tags && page.tags.length
+    meta(name="keywords" content=keywords)
+else if config.keywords
+    meta(name="keywords" content=config.keywords)
+
+if page.description
+    meta(name="description" content=page.description)
+else if page.excerpt
+    meta(name="description" content=page.excerpt)
+else if config.description
+    meta(name="description" content=config.description)
+
+!= canonical()
+
+if theme.open_graph
+    != open_graph(theme.open_graph)

package/layout/_partials/head/pwa.pug

@@ -1,18 +1,18 @@
-//- https://blog.cyfan.top/p/c0af86bb.html#%E5%AE%89%E8%A3%85-Install
-- var timeNow = new Date().getTime()
-if theme.pwa.enable
-    - var sworker = theme.pwa.serviceworker
-    script(data-pjax async).
-         if ('serviceWorker' in navigator) {
-            navigator.serviceWorker.register("/#{sworker}?time=#{timeNow}").then(async (reg) => {
-                    if (window.localStorage.getItem('install') !== 'true') {
-                        window.localStorage.setItem('install', 'true');
-                        setTimeout(() => {
-                            window.location.reload()
-                        }, 500)
-                    }
-                }).catch(err => {
-                console.log(err)
-            });
-            }
-    link(rel="manifest" href=`/${theme.pwa.manifest}`)
+//- https://blog.cyfan.top/p/c0af86bb.html#%E5%AE%89%E8%A3%85-Install
+- var timeNow = new Date().getTime()
+if theme.pwa.enable
+    - var sworker = theme.pwa.serviceworker
+    script(data-pjax async).
+         if ('serviceWorker' in navigator) {
+            navigator.serviceWorker.register("/#{sworker}?time=#{timeNow}").then(async (reg) => {
+                    if (window.localStorage.getItem('install') !== 'true') {
+                        window.localStorage.setItem('install', 'true');
+                        setTimeout(() => {
+                            window.location.reload()
+                        }, 500)
+                    }
+                }).catch(err => {
+                console.log(err)
+            });
+            }
+    link(rel="manifest" href=`/${theme.pwa.manifest}`)

package/layout/_partials/header.pug

@@ -1,18 +1,18 @@
-nav(id="nav")
-    div(class="inner")
-        div(class="toggle")
-            div(class="lines" aria-label!=__('accessibility.nav_toggle'))
-                span(class="line")
-                span(class="line")
-                span(class="line")
-        ul(class="menu")
-            li(class="item title")
-                a(href=config.root rel="start")
-                    != alternate || title
-        ul(class="right" id="rightNav")
-            li(class="item theme")
-                i(class="ic i-sun")
-            li(class="item search")
-                i(class="ic i-search")
-            != shokax_inject('rightNav')
-
+nav(id="nav")
+    div(class="inner")
+        div(class="toggle")
+            div(class="lines" aria-label!=__('accessibility.nav_toggle'))
+                span(class="line")
+                span(class="line")
+                span(class="line")
+        ul(class="menu")
+            li(class="item title")
+                a(href=config.root rel="start")
+                    != alternate || title
+        ul(class="right" id="rightNav")
+            li(class="item theme")
+                i(class="ic i-sun")
+            li(class="item search")
+                i(class="ic i-search")
+            != shokax_inject('rightNav')
+