1. 更改手機頁面的menu和toc的顯示方式和顯示特效（ipad也能看TOC)

1. 更改手機頁面的menu和toc的顯示方式和顯示特效（ipad也能看TOC)
3. 可設置複製時，内容自動加上版權信息
4. 可修改tag的top_img
5. 可修改category的top_img
6. 可修改valine的背景
7. archives頁UI優化
8. ICP增加icon #37
9. 可設置主頁top_img的高度
10. 可設置主頁site-info的位置
11. category頁和tag頁的UI可以設置與主頁UI一樣 #31
12. 主頁subtitle可設置多個句子（不再限制2個） #37
13. 設置menu時，頭尾添加空格不受影響
14. 調整post頁的佈局
15. 书签添加icon
16. 公告icon效果
17. 首頁歸檔模塊，可設置數量限制，會顯示'查看更多'按鈕
18. 右下角按鈕調整。
19. 修复文章cover隨機图片生成，同一篇文章，不同地方的cover顯示不一样的bug
20. 修復gitalk語言設置無效的bug #35
21. 修復post頁面，當沒有設置word count時，閲讀量前有'|"
22. 修复sub-menu在safari的显示问题
23. 修复tags页评论居中问题
24. 修复header a hover 白色问题
25. 修復夜間模式下footer的顔色bug
26. 修復英文語言下，書簽英文顯示不完整的問題

layout/includes/additional-js.pug

@@ -45,49 +45,13 @@ if is_home() && theme.subtitle.enable
   script(src="https://cdn.jsdelivr.net/npm/typed.js@2.0.9")    
   script.
     var typed = new Typed(".subtitle", {
-    strings: ['!{theme.subtitle.sub1}','!{theme.subtitle.sub2}'],
+    strings: '!{theme.subtitle.sub}'.split(","),
     startDelay: 300,
     typeSpeed: 100,
     loop: true,
     backSpeed: 50
     });
 
-if is_home()  
-  script.
-    //首頁fullpage
-    function alignContent() {
-      for (var n = $(window).height(), e = document.querySelectorAll(".full_page"), i = 0; i < e.length; i++) 
-        e[i].style.height = n + "px";
-        $("#site-info").each(function () {
-          var x = $(this).height();
-          $(this).css("top", (n-x)/2)       
-        })
-    }
-
-    function recent_post_padding() {
-      $(".recent-post-info").each(function () {
-        var k = $(".recent-post-item").height();
-        var e = $(this).height();
-        $(this).css({"padding-top": (k-e)/2 , "padding-bottom": (k-e)/2 })
-      })   
-    }
-
-    alignContent();
-
-    //recent-post-item垂直置中
-    if ($(window).width() > 768) {    
-      recent_post_padding();
-    }
-     
-    $(window).bind("resize", function () {
-
-      alignContent()
-
-      if ($(window).width() > 768) {    
-        recent_post_padding();     
-      }
-    })
-
 if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
   script(async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js")
 
@@ -99,3 +63,21 @@ if theme.lazyload.enable
   script. 
     const observer = lozad(); // lazy loads elements with default selector as '.lozad'
     observer.observe();
+
+if is_home() && !theme.index_top_img_height && !theme.index_site_info_top
+  script.
+    //首頁fullpage
+    function alignContent() {
+      for (var n = $(window).height(), e = document.querySelectorAll(".full_page"), i = 0; i < e.length; i++) 
+        e[i].style.height = n + "px";
+        $("#site-info").each(function () {
+          var x = $(this).height();
+          $(this).css("top", (n-x)/2)       
+        })
+    }
+    alignContent();
+    
+    $(window).bind("resize", function () {
+      alignContent()
+    })
+

layout/includes/comments/gitalk.pug

@@ -8,6 +8,6 @@ if theme.gitalk && theme.gitalk.enable
       owner: '!{theme.gitalk.owner}',
       admin: '!{theme.gitalk.admin}',
       id: md5(decodeURI(location.pathname)),
-      language: '!{lang}'
+      language: '!{theme.gitalk.language}'
     })
     gitalk.render('gitalk-container')

layout/includes/config.pug

@@ -28,7 +28,6 @@
   }
   var translate = 'undefined';
   if (theme.translate && theme.translate.enable){
-    var defaultEncoding;
     translate = JSON.stringify({
       defaultEncoding: theme.translate.defaultEncoding,
       translateDelay: theme.translate.translateDelay,
@@ -38,7 +37,19 @@
     })
   }
 
+  var copyright = 'undefined' ;
+  if (theme.copy.enable && theme.copy.copyright){
+    copyright = JSON.stringify({      
+      languages: {
+      author: _p("copy_copyright.author") + ': ' + config.author,
+      link: _p("copy_copyright.link") + ': ' + without_html,
+      source: _p("copy_copyright.source") + ': ' + config.title,
+      info: _p("copy_copyright.info")
+      }
+    })
+  }
 
+  var copy_copyright_js = theme.copy.enable && theme.copy.copyright
 
 
 
@@ -61,8 +72,9 @@ script.
       message_prev: '!{_p("bookmark.message_prev")}',
       message_next: '!{_p("bookmark.message_next")}'
     },
-    runtime_unit: '!{_p("runtime_unit")}'
-  
+    runtime_unit: '!{_p("runtime_unit")}',
+    copyright: !{copyright},
+    copy_copyright_js: !{copy_copyright_js}
     
   }
 

layout/includes/footer.pug

@@ -19,4 +19,6 @@
   if theme.ICP.enable
     .icp
       a(href=theme.ICP.url)
+        if theme.ICP.icon
+          img.icp-icon(src=url_for(theme.ICP.icon))
         span=theme.ICP.text

layout/includes/head.pug

@@ -1,6 +1,6 @@
 - var without_index = url.replace('index.html', '')
 - var without_html = without_index.replace('.html', '')
-- var photo_check = page.cover || theme.avatar
+- var photo_check = is_post() ? page.cover || theme.avatar : theme.avatar
 - var photo_link = url_check (photo_check) ? photo_check : config.url + photo_check
 
 meta(http-equiv="x-dns-prefetch-control" content="on")
@@ -107,10 +107,16 @@ if theme.qihu_site_verification
 
 
 - var preload_archive_img = theme.archive_img ||theme.top_img || config.top_img
+- var preload_tag_img = theme.tag_img ||theme.top_img || config.top_img
+- var preload_category_img = theme.category_img ||theme.top_img || config.top_img
 - var preload_img = page.top_img || theme.top_img || config.top_img
 
 if (is_archive() && preload_archive_img) 
   link(rel="preload" href=url_for(preload_archive_img)  as="image" )
+else if (is_tag() && preload_tag_img) 
+  link(rel="preload" href=url_for(preload_tag_img)  as="image" )
+else if (is_category() && preload_category_img) 
+  link(rel="preload" href=url_for(preload_category_img)  as="image" )
 else if (!is_post() && preload_img)
   link(rel="preload" href=url_for(preload_img)  as="image" )
 

layout/includes/header.pug

@@ -1,65 +1,13 @@
-#page-header
-  span.pull-left 
-    a#site-name.blog_title(href=url_for('/')) #[=config.title]
-  //- i.fa.fa-bars.toggle-menu.pull-right(aria-hidden="true")
-  .open.toggle-menu.pull-right
-    .menu-icon-first
-    .menu-icon-second
-    .menu-icon-third
-  
-  .menu_mask
-  
-  span.pull-right.menus
-    .mobile_author_icon
-      img.lozad.avatar_img(src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
-    .mobile_post_data
-      if site.posts.length
-        .mobile_data_item.text-center
-          .mobile_data_link
-            a(href=url_for(config.archive_dir) + '/')
-              .headline= _p('aside.articles') 
-              .length_num= site.posts.length
-
-      if site.tags.length
-        .mobile_data_item.text-center       
-          .mobile_data_link
-            a(href=url_for(config.tag_dir) + '/' )
-              .headline= _p('aside.tags')
-              .length_num= site.tags.length
-
-      if site.categories.length
-        .mobile_data_item.text-center      
-          .mobile_data_link
-            a(href=url_for(config.category_dir) + '/')
-              .headline= _p('aside.categories') 
-              .length_num= site.categories.length
-
-    hr
-    .menus_items
-      each value, label in theme.menu
-        if !Array.isArray(value)
-          .menus_item
-            a.site-page(href=value.split('||')[0])
-              i.fa-fw(class=value.split('||')[1])
-              span=' '+label
-        else
-          .menus_item
-            a.site-page
-              i.fa-fw(class=label.split('||')[1] aria-hidden="true")
-              span=' '+label.split('||')[0]
-              i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
-            ul.menus_item_child
-              each i in value
-                li
-                  a.site-page(href=i.split('||')[1])
-                    i.fa-fw(class=i.split('||')[2])
-                    span=' '+i.split('||')[0]
-
-
-      script.
-        document.body.addEventListener('touchstart', function(){ });
-  span.pull-right
-    if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
-        a.site-page.social-icon.search
-          i.fa.fa-search.fa-fw
-          span=' '+_p('search')
+#header  
+  #page-header
+    span#blog_name.pull-left
+      a#site-name.blog_title(href=url_for('/')) #[=config.title]
+    i.fa.fa-bars.fa-fw.toggle-menu.pull-right.close(aria-hidden="true")
+    span.pull-right.menus
+      .menus_items
+        include menu_item.pug
+    span#search_button.pull-right
+      if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
+          a.site-page.social-icon.search
+            i.fa.fa-search.fa-fw
+            span=' '+_p('search')

layout/includes/layout.pug

@@ -16,9 +16,10 @@
 - config.subtitle ? home_subtitle_true = ' - ' + config.subtitle : home_subtitle_true = ''
 //- home時pageTitle顯示 JerryC - subtitle，其他顯示 pageTitle | JerryC
 - is_home() ? pageTitle = config.title + home_subtitle_true : pageTitle = pageTitle_saved
+//- 判断keywords
 
 - var pageDescription = page.description || page.title || config.description || ''
-- var pageKeywords = (config.keywords || []).join(',')
+- var pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
@@ -49,35 +50,35 @@ html(lang=config.language)
   body(class=body_class)
     if theme.fireworks && theme.fireworks.enable
       canvas.fireworks
-    if theme.background
-      #web_bg
-    if (is_post() && page.toc != false && theme.toc.enable)
-      i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true")
-      include ./sidebar.pug
-    if (!is_post())
-      include ./nav.pug
-    #content-outer
-      block top_img
+    include ./header.pug
+    include ./mobile-sidebar.pug
+    #body-wrap
+      if theme.background
+        #web_bg
+      if (is_post() && page.toc != false && theme.toc.enable)      
+        i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true")      
+        include ./sidebar.pug
       if (!is_post())
-        #content-inner.layout_page
-          if body
-            div!= body
-          else
-            block content
-      else
-        #content-inner.layout.layout_post    
-          if body
-            div!= body
-          else
-            block content
-    
-    - var footer_bg = theme.footer_bg == false ? '' : bg_img
-    footer(style=footer_bg)
-      include ./footer.pug
-    i.fa.fa-arrow-up#go-up(aria-hidden="true")
+        include ./nav.pug
+      #content-outer
+        block top_img
+        if (!is_post())
+          #content-inner.layout_page
+            if body
+              div!= body
+            else
+              block content
+        else
+          #content-inner.layout.layout_post    
+            if body
+              div!= body
+            else
+              block content
+      
+      - var footer_bg = theme.footer_bg == false ? '' : bg_img
+      footer(style=footer_bg)
+        include ./footer.pug    
     include ./rightside.pug
-    if (is_post())
-      include ./post-bottom.pug
     each item in theme.cdn.js
       if item !== undefined
         script(src=url_for(item))

layout/includes/menu_item.pug

@@ -0,0 +1,20 @@
+each value, label in theme.menu
+  if !Array.isArray(value)
+    .menus_item
+      a.site-page(href=trim(value.split('||')[0]))
+        i.fa-fw(class=trim(value.split('||')[1]))
+        span=' '+label
+  else
+    .menus_item
+      a.site-page
+        i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true")
+        span=' '+ trim(label.split('||')[0])
+        i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
+      ul.menus_item_child
+        each i in value
+          li
+            a.site-page(href=trim(i.split('||')[1]))
+              i.fa-fw(class=trim(i.split('||')[2]))
+              span=' '+trim(i.split('||')[0])
+script.
+  document.body.addEventListener('touchstart', function(){ });

layout/includes/mixins/UI.pug

@@ -0,0 +1,41 @@
+mixin UI_NEW(posts)
+  - posts.each(function(article,index){
+    .recent-post-item.article-container
+      - var link = article.link || article.path
+        if index%2 == 0
+          .post_cover.is_left
+            a(href=url_for(link) title=article.title || _p('no_title'))
+              - var post_cover = article.cover
+              if theme.lazyload.enable
+                img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
+              else
+                img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
+        else
+          .post_cover.is_right
+            a(href=url_for(link) title=article.title || _p('no_title'))
+              - var post_cover = article.cover
+              if theme.lazyload.enable
+                img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
+              else
+                img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)            
+      .recent-post-info   
+        a.article-title(href=url_for(link) title= article.title || _p('no_title'))= article.title || _p('no_title')
+        if (theme.post_meta.date_type)
+          - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
+          time.post-meta__date #[i.fa.fa-calendar(aria-hidden="true")] #[=date(article[date_type], config.date_format)]
+        if (theme.post_meta.categories && article.categories.data.length > 0)
+          span.article-meta
+            span.article-meta__separator |
+            each item, index in article.categories.data
+              i.fa.fa-inbox.article-meta__icon(aria-hidden="true")
+              a(href=url_for(item.path)).article-meta__categories #[=item.name]
+              if (index < article.categories.data.length - 1)
+                  i.fa.fa-angle-right(aria-hidden="true")
+        if theme.auto_excerpt && theme.auto_excerpt.enable
+          - const content = strip_html(article.content)
+          - let expert = content.substring(0, theme.auto_excerpt.length) 
+          - content.length > theme.auto_excerpt.length ? expert += ' ...' : ''
+          .content!= expert
+        else
+          .content!= article.description
+  - })

layout/includes/mixins/article-sort.pug

@@ -7,6 +7,12 @@ mixin articleSort(posts)
         - year = tempYear
         .article-sort-item.year= year
       .article-sort-item
-        time.article-sort-item__time= date(article.date)
-        a.article-sort-item__title(href=url_for(article.path))= article.title || 'No Title'
+        .article-sort-img
+          a.article-sort-item__img(href=url_for(article.path))
+            img(src=article.cover)
+        .article-sort-post
+          a.article-sort-item__post(href=url_for(article.path))
+            i.fa.fa-clock-o(aria-hidden="true")
+            time.article-sort-item__time= date(article.date)
+            .article-sort-item__title= article.title || 'No Title'
     - })

layout/includes/mobile-sidebar.pug

@@ -0,0 +1,46 @@
+#mobile-sidebar
+  #menu_mask
+  #mobile-sidebar-menus
+    .mobile_author_icon
+      img.lozad.avatar_img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
+    .mobile_post_data
+      if site.posts.length
+        .mobile_data_item.is_center
+          .mobile_data_link
+            a(href=url_for(config.archive_dir) + '/')
+              .headline= _p('aside.articles') 
+              .length_num= site.posts.length
+
+      if site.tags.length
+        .mobile_data_item.is_center       
+          .mobile_data_link
+            a(href=url_for(config.tag_dir) + '/' )
+              .headline= _p('aside.tags')
+              .length_num= site.tags.length
+
+      if site.categories.length
+        .mobile_data_item.is_center      
+          .mobile_data_link
+            a(href=url_for(config.category_dir) + '/')
+              .headline= _p('aside.categories') 
+              .length_num= site.categories.length
+    hr
+    .menus_items
+      include menu_item.pug
+
+
+  
+  - const showToc = is_post() && page.toc != false && theme.toc.enable
+  -
+    let tocNumber
+    if (page.toc_number !== undefined) tocNumber = page.toc_number
+    else if (theme.toc.number !== undefined) tocNumber = theme.toc.number
+    else tocNumber = true
+  -
+  if (showToc)
+    #mobile-sidebar-toc
+      .toc_mobile_headline= _p('sidebar.catalog')
+      if (page.encrypt == true)
+        .toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items",list_number:tocNumber})
+      else 
+        !=toc(page.content,{"class":"toc_mobile_items",list_number:tocNumber})

layout/includes/nav.pug

@@ -1,5 +1,9 @@
-if (is_archive())
+if is_archive()
   - var top_img = theme.archive_img ||theme.top_img || config.top_img
+else if is_tag()
+  - var top_img = theme.tag_img ||theme.top_img || config.top_img
+else if is_category()
+  - var top_img = theme.category_img ||theme.top_img || config.top_img
 else
   - var top_img = page.top_img||theme.top_img || config.top_img
 
@@ -9,7 +13,6 @@ else
 if is_home()
   nav#nav.full_page
     .nav_bg(style=bg_img)
-    include ./header.pug
     #site-info
       #site-title
         span.blogtitle= page.title || page.tag || page.category || config.title
@@ -28,7 +31,6 @@ if is_home()
 else
   nav#nav.not_index_bg
     .nav_bg(style=bg_img)
-    include ./header.pug
     #page_site-info
       #site-title
           if (is_archive()) 

layout/includes/page_tag.pug

@@ -0,0 +1,6 @@
+- site.tags.sort('path').each(function (tags){
+  - var fontSize = Math.floor(Math.random() * 15 + 15) + "px"; //15 ~ 30
+  - var color = "rgb(" + Math.floor(Math.random() * 201) + ", " + Math.floor(Math.random() * 201) +", " + Math.floor(Math.random() * 201) +")"; // 0,0,0 -> 200,200,200
+
+  a(href=url_for(tags.path) style='font-size:' + fontSize + ';color:' + color)=tags.name
+-})

layout/includes/pagination.pug

@@ -14,7 +14,7 @@ else
     if(page.prev)
       if(page.next)
         .prev-post.pull-left
-          - var pagination_cover = page.prev.cover || random_cover()
+          - var pagination_cover = page.prev.cover
           a(href=url_for(page.prev.path))
             if theme.lazyload.enable
               img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` )
@@ -26,7 +26,7 @@ else
               span=page.prev.title
       else
         .prev-post.pull-full
-          - var pagination_cover = page.prev.cover || random_cover()
+          - var pagination_cover = page.prev.cover
           a(href=url_for(page.prev.path))
             if theme.lazyload.enable
               img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
@@ -39,7 +39,7 @@ else
     if(page.next)
       if(page.prev)
         .next-post.pull-right
-          - var pagination_cover = page.next.cover || random_cover()
+          - var pagination_cover = page.next.cover
           a(href=url_for(page.next.path))
             if theme.lazyload.enable
               img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
@@ -50,7 +50,7 @@ else
               span=page.next.title 
       else
         .next-post.pull-full
-          - var pagination_cover = page.next.cover || random_cover()
+          - var pagination_cover = page.next.cover
           a(href=url_for(page.next.path))
             if theme.lazyload.enable
               img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)

layout/includes/post-bottom.pug

@@ -1,17 +0,0 @@
-- var no_comment_show = page.comments !== false ? '' : 'no_comment_show'
-- var no_toc_show = (is_post() && page.toc != false && theme.toc.enable) ? '' : 'no_toc_show'
-#post_bottom(class= no_comment_show + ' ' + no_toc_show)
-  #post_bottom_items
-    if page.comments !== false
-      a#mobile_to_comment(href="#post-comment")
-        i.mobile_scroll_to_comment.fa.fa-comments
-    
-    if (is_post() && page.toc != false && theme.toc.enable)
-      i#mobile_toc.fa.fa-list
-      #toc_mobile
-        .toc_mobile_headline= _p('sidebar.catalog')
-        if (page.encrypt == true)
-          .toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items"})
-        else 
-          !=toc(page.content,{"class":"toc_mobile_items"})
-        

layout/includes/recent-posts.pug

@@ -5,32 +5,18 @@ each article , index in page.posts.data
         .post_cover.is_left
           a(href=url_for(link) title=article.title || _p('no_title'))
             - var post_cover = article.cover
-            - var default_post_cover = random_cover()
-            if (post_cover)
-              if theme.lazyload.enable
-                img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-              else
-                img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
+            if theme.lazyload.enable
+              img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
             else
-              if theme.lazyload.enable
-                img.post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-              else
-                img.post_bg(src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
+              img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
       else
         .post_cover.is_right
           a(href=url_for(link) title=article.title || _p('no_title'))
             - var post_cover = article.cover
-            - var default_post_cover = random_cover()
-            if (post_cover)
-              if theme.lazyload.enable
-                img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-              else
-                img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)            
+            if theme.lazyload.enable
+              img.post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
             else
-              if theme.lazyload.enable
-                img.post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-              else
-                img.post_bg(src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
+              img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)            
     .recent-post-info   
       a.article-title(href=url_for(link) title= article.title || _p('no_title'))= article.title || _p('no_title')
       if (article.top)
@@ -49,14 +35,6 @@ each article , index in page.posts.data
             a(href=url_for(item.path)).article-meta__categories #[=item.name]
             if (index < article.categories.data.length - 1)
                 i.fa.fa-angle-right(aria-hidden="true")
-      //- if (theme.post_meta.tags && article.tags.data.length > 0)
-      //-   span.article-meta.tags
-      //-     span.article-meta__separator |
-      //-     each item, index in article.tags.data
-      //-       i.fa.fa-tag.article-meta__icon(aria-hidden="true")
-      //-       a(href=url_for(item.path)).article-meta__tags #[=item.name]
-      //-       if (index < article.tags.data.length - 1)
-      //-         span.article-meta__link -
       if theme.auto_excerpt && theme.auto_excerpt.enable
         - const content = strip_html(article.content)
         - let expert = content.substring(0, theme.auto_excerpt.length) 

layout/includes/reward.pug

@@ -1,5 +1,5 @@
 .post-reward
-  a.reward-buttom
+  a.reward-button
     i.fa.fa-qrcode
     = ' ' + _p('donate')
     .reward-main

layout/includes/rightside.pug

@@ -1,13 +1,20 @@
 section#rightside.rightside
-  if is_post() && page.comments !== false
-    a#to_comment(href="#post-comment")
-      i.scroll_to_comment.fa.fa-comments
-  if theme.readmode.enable && is_post()
-    i#readmode.fa.fa-book(title=_p('rightside.readmode_title')) 
-  i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
-  i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
-  if theme.translate && theme.translate.enable
-    a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title'))= theme.translate.default
-  if theme.nightshift.enable
-    - var display_mode = theme.display_mode == 'night'? 'fa fa-sun-o' : 'fa fa-moon-o'
-    i#nightshift.nightshift(class=display_mode title=_p('rightside.night_mode_title'))
+  #rightside-config-hide
+    if theme.readmode.enable && is_post()
+      i#readmode.fa.fa-book(title=_p('rightside.readmode_title'))
+    i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
+    i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
+    if theme.translate && theme.translate.enable
+      a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title'))= theme.translate.default
+    if theme.nightshift && theme.nightshift.enable
+      - var display_mode = theme.display_mode == 'night'? 'fa fa-sun-o' : 'fa fa-moon-o'
+      i#nightshift.nightshift(class=display_mode title=_p('rightside.night_mode_title'))
+  #rightside-config-show
+    #rightside_config(title=_p("rightside.setting"))
+      i.fa.fa-cog(aria-hidden="true")
+    if is_post() && page.comments !== false
+      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+        i.scroll_to_comment.fa.fa-comments   
+    if is_post() && page.toc != false && theme.toc.enable
+      i#mobile-toc-button.fa.fa-list-ul.close(title=_p("rightside.toc") aria-hidden="true")
+    i.fa.fa-arrow-up#go-up(title=_p("rightside.back_to_top") aria-hidden="true")

layout/includes/widget/card_author.pug

@@ -1,35 +1,37 @@
 .card_widget.card-author
   .card-content
     .post_data
-      .data-item.text-center
-        img.lozad.avatar_img(src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
-        p.author-info__name.text-center= config.author
-        p.author-info__description.text-center= config.description
+      .data-item.is_center
+        img.lozad.avatar_img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
+        p.author-info__name.is_center= config.author
+        p.author-info__description.is_center= config.description
 
     .post_data.data_config
       if site.posts.length
-        .data-item.text-center
+        .data-item.is_center
           .data_link
             a(href=url_for(config.archive_dir) + '/')
               p.headline= _p('aside.articles') 
               p.length_num= site.posts.length
 
       if site.tags.length
-        .data-item.text-center       
+        .data-item.is_center       
           .data_link
             a(href=url_for(config.tag_dir) + '/' )
               p.headline= _p('aside.tags')
               p.length_num= site.tags.length
 
       if site.categories.length
-        .data-item.text-center      
+        .data-item.is_center      
           .data_link
             a(href=url_for(config.category_dir) + '/')
               p.headline= _p('aside.categories') 
               p.length_num= site.categories.length
 
-    .post_data.text-center
-      a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') )=  _p('aside.card_bookmark') || 'Follow Me'
+    .post_data.is_center
+      a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') )
+        i.fa.fa-bookmark(aria-hidden="true")
+        span= _p('aside.card_bookmark') || 'Follow Me'
       
   
   

layout/includes/widget/card_recent_post.pug

@@ -9,18 +9,11 @@
           - var link = article.link || article.path
             a(href=url_for(link))
               - var post_cover = article.cover
-              - var default_post_cover = random_cover()
               .aside_post_cover
-                if (post_cover)
-                  if theme.lazyload.enable
-                    img.aside_post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
-                  else
-                    img.aside_post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
+                if theme.lazyload.enable
+                  img.aside_post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
                 else
-                  if theme.lazyload.enable
-                    img.aside_post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
-                  else
-                    img.aside_post_bg(src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
+                  img.aside_post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
               div#aside_title
                 .aside_post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title')
                 if (theme.post_meta.date_type)