🔖 2.2.5發佈

更新内容請看 https://github.com/jerryc127/hexo-theme-butterfly/releases

layout/includes/header/header.pug

@@ -1,15 +1,18 @@
 #page-header
   span#blog_name.pull_left
     a#site-name.blog_title(href=url_for('/')) #[=config.title]
-  span.toggle-menu.pull_right.close
-    a.site-page
-      i.fa.fa-bars.fa-fw(aria-hidden="true")
+    
   span.pull_right.menus
+    if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
+      #search_button
+        a.site-page.social-icon.search
+          i.fa.fa-search.fa-fw
+          span=' '+_p('search')
     .menus_items
       include ./menu_item.pug
 
-  if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
-    span#search_button.pull_right
-      a.site-page.social-icon.search
-        i.fa.fa-search.fa-fw
-        span=' '+_p('search')
+    span.toggle-menu.close
+      a.site-page
+        i.fa.fa-bars.fa-fw(aria-hidden="true")
+
+

layout/includes/header/index.pug

@@ -33,9 +33,7 @@ if theme.douban
         span#subtitle
       if(theme.social)
         #site_social_icons
-          each url, icon in theme.social
-            a.social-icon(href=url target="_blank")
-              i(class=icon aria-hidden="true")     
+          !=partial('includes/header/social', {}, {cache:theme.fragment_cache})
     #scroll_down
       i.fa.fa-angle-down.scroll-down-effects
   else if is_post()

layout/includes/header/post-info.pug

@@ -7,17 +7,19 @@
       if (theme.post_meta.post.date_type)
         if (theme.post_meta.post.date_type === 'both')
           time.post-meta__date
-            i.fa.fa-calendar(aria-hidden="true")
-            =' '+_p('post.created')+' '+date(page.date, config.date_format)
+            span.post-meta__date-created(title= _p('post.created')+' '+full_date(page.date))
+              i.fa.fa-calendar(aria-hidden="true")
+              =' '+_p('post.created')+' '+date(page.date, config.date_format)
             span.post-meta__separator |
-            i.fa.fa-history(aria-hidden="true")
-            =' '+_p('post.updated')+' '+date(page.updated, config.date_format)
+            span.post-meta__date-updated(title= _p('post.updated')+' '+full_date(page.updated))
+              i.fa.fa-history(aria-hidden="true")
+              =' '+_p('post.updated')+' '+date(page.updated, config.date_format)
         else
           - var data_type_update = theme.post_meta.post.date_type === 'updated'
           - var date_type = data_type_update ? 'updated' : 'date'
           - var date_icon = data_type_update ? 'fa-history' :'fa-calendar'
           - var data_info = data_type_update ? _p('post.updated') : _p('post.created')
-          time.post-meta__date
+          time.post-meta__date(title=data_info + ' ' + full_date(page[date_type]))
             i.fa(class=date_icon aria-hidden="true")
             =' ' + data_info + ' ' + date(page[date_type], config.date_format)
                 
@@ -33,7 +35,7 @@
               i.fa.fa-angle-right.post-meta__separator(aria-hidden="true")
 
     .meta-secondline  
-      - let postWordcount = theme.wordcount.post_wordcount || theme.wordcount.min2read
+      - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
       if (postWordcount)
         span.post-meta-wordcount
           if theme.wordcount.post_wordcount

layout/includes/header/social.pug

@@ -0,0 +1,4 @@
+each url, icon in theme.social
+  a.social-icon(href=trim(url.split('||')[0]) target="_blank" 
+  title=url.split('||')[1] === undefined ? '' : trim(url.split('||')[1]))
+    i(class=icon aria-hidden="true")