1. new look of the mobile menu

2. fix bugs
2026-04-16 17:50:54 +08:00 · 2019-06-26 16:23:08 +08:00
parent 6b07467dc6
commit 6656cb8c6f
24 changed files with 408 additions and 221 deletions
--- a/layout/includes/additional-js.pug
+++ b/layout/includes/additional-js.pug
@@ -57,7 +57,7 @@ if is_home()
        e[i].style.height = n + "px";
        $("#site-info").each(function () {
          var x = $(this).height();
-          $(this).css("top", (n-x)/2)
+          $(this).css({"padding-top": (n-x)/2 , "padding-bottom":(n-x)/2 })
        })
    }

--- a/layout/includes/aside.pug
+++ b/layout/includes/aside.pug
@@ -1,132 +1,21 @@
 if theme.aside.card_author
-  .card_widget.card-author
-    .card-content
-      .post_data
-        .data-item.text-center
-          img.lozad(data-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
-
-      .post_data.data_config
-        if site.posts.length
-          .data-item.text-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_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_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'
-        
-    
-    
-      if(theme.social)
-        .post_data.data_config
-          #aside-social-icons 
-            each url, icon in theme.social
-              a.social-icon.data-item(href=url target="_blank")
-                i(class=icon)
+  include widget/card_author.pug

 if theme.aside.card_announcement
-  .card_widget.card-announcement
-    .card-content
-      .item_headline
-        i.fa.fa-bullhorn.card-announcement-animation(aria-hidden="true")
-        span= _p('aside.card_announcement')
-      .announcement_content= theme.announcement.content
+  include widget/card_announcement.pug

 if theme.aside.card_recent_post
-  .card_widget.card-recent-post
-    .card-content
-      .item_headline
-        i.fa.fa-history(aria-hidden="true")
-        span= _p('aside.card_recent_post')
-      .aside_recent_item
-        - site.posts.sort('date', -1).limit(5).each(function(article){
-          .aside_recent_post
-            - var link = article.link || article.path
-              a(href=url_for(link))
-                - var post_cover = article.cover
-                - var default_post_cover = theme.default_cover
-                .aside_post_cover
-                  if (post_cover)
-                    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.lozad(data-src=`${default_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)
-                    - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
-                    time.aside_post_meta.post-meta__date #[=date(article[date_type], config.date_format)]
-      
-        - })
-
+  include widget/card_recent_post.pug
+  
 if theme.aside.card_categories   
-  .card_widget.card-categories
-    .card-content
-      .item_headline
-        i.fa.fa-folder-open(aria-hidden="true")
-        span= _p('aside.card_categories')
-      ul.aside_category_item
-        - site.categories.sort('name').each(function(category){
-          li.aside_category_list
-            a.aside_category_list_link(href='/' + `${category.path}`)
-              span.aside_category_list_name= category.name
-              span.aside_category_list_length= category.length
-        - })
+  include widget/card_categories.pug

 if theme.aside.card_tags
-  .card_widget.card-tags
-    .card-content
-      .item_headline
-        i.fa.fa-tags(aria-hidden="true")
-        span= _p('aside.card_tags')
-      .card-tag-cloud!= tagcloud({min_font: 16, max_font: 24, amount: 200, color: true, start_color: '#999', end_color: '#000'})
+  include widget/card_tags.pug

 if theme.aside.card_archives
-  .card_widget.card-archives
-    .card-content
-      .item_headline
-        i.fa.fa-archive(aria-hidden="true")
-        span= _p('aside.card_archives')
-      div.archives_item!= list_archives({type:'monthly',format: 'YYYY年MM月'})
+  include widget/card_archives.pug

 if theme.aside.card_webinfo
-  .card_widget.card-webinfo
-    .card-content
-      .item_headline
-          i.fa.fa-line-chart(aria-hidden="true")
-          span= _p('aside.card_webinfo.headline')
-      .webinfo
-        .webinfo_item
-          .webinfo_article_name= _p('aside.card_webinfo.article_name') + " :"
-          .webinfo_article_count= site.posts.length      
-        if theme.runtimeshow.enable
-          .webinfo_item
-            .webinfo_runtime_name= _p('aside.card_webinfo.runtime_name') + " :"
-            #webinfo_runtime_count.webinfo_runtime_count
-            script#runtionshow(src=url_for('js/runtimeshow.js') start_date=theme.runtimeshow.start_date)       
-        
-        if theme.busuanzi.site_uv 
-          .webinfo_item       
-            .webinfo_site_uv_name= _p('aside.card_webinfo.site_uv_name') + " :"
-            .webinfo_site_uv_count#busuanzi_value_site_uv
-        if theme.busuanzi.site_pv
-          .webinfo_item
-            .webinfo_site_name= _p('aside.card_webinfo.site_pv_name') + " :"
-            .webinfo_site_pv_count#busuanzi_value_site_pv
-
+  include widget/card_webinfo.pug
+  
--- a/layout/includes/comments/valine.pug
+++ b/layout/includes/comments/valine.pug
@@ -1,7 +1,7 @@
 if theme.valine && theme.valine.enable
  #vcomment.vcomment
-  script(src='https://cdn1.lncld.net/static/js/3.0.4/av-min.js')
-  script(src='https://cdn.jsdelivr.net/npm/valine/dist/Valine.min.js')
+  script(src='https://cdn.jsdelivr.net/npm/leancloud-storage/dist/av-min.js')
+  script(src='https://cdn.jsdelivr.net/npm/valine@v1.3.6/dist/Valine.min.js')
  script.
    var notify = '#{ theme.valine.notify }' == true ? true : false;
    var verify = '#{ theme.valine.verify }' == true ? true : false;
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -1,5 +1,7 @@
 - var without_index = url.replace('index.html', '')
 - var without_html = without_index.replace('.html', '')
+- var photo_check = page.cover || theme.avatar
+- var photo_link = url_check (photo_check) ? photo_check : config.url + photo_check

 meta(http-equiv="x-dns-prefetch-control" content="on")
 if theme.canonical
@@ -9,7 +11,7 @@ if theme.twitter_meta
  meta(name="twitter:card" content="summary_large_image")
  meta(name="twitter:title" content=pageTitle_no_include_blog_name)
  meta(name="twitter:description" content=pageDescription)
-  meta(name="twitter:image" content= page.cover|| theme.avatar)
+  meta(name="twitter:image" content=photo_link)

 if theme.Open_Graph_meta
  if is_post()
@@ -21,7 +23,7 @@ if theme.Open_Graph_meta
  meta(property="og:url" content=without_html)
  meta(property="og:site_name" content=config.title)
  meta(property="og:description" content=pageDescription)
-  meta(property="og:image" content= page.cover|| theme.avatar)
+  meta(property="og:image" content=photo_link)

 if theme.disable_baidu_transformation
  meta(http-equiv="Cache-Control" content="no-transform")
@@ -108,6 +110,6 @@ if theme.qihu_site_verification
 - var preload_img = page.top_img || theme.top_img || config.top_img

 if (is_archive() && preload_archive_img) 
-  link(rel="preload" href=preload_img  as="image" )
+  link(rel="preload" href=url_for(preload_img)  as="image" )
 else if (!is_post() && preload_img)
-  link(rel="preload" href=preload_img  as="image" )
+  link(rel="preload" href=url_for(preload_img)  as="image" )
--- a/layout/includes/header.pug
+++ b/layout/includes/header.pug
@@ -8,12 +8,17 @@
    .menu-icon-third
    
  span.pull-right.menus
-    each value, label in theme.menu
-      a.site-page(href=value.split('||')[0])
-        i.fa-fw(class=value.split('||')[1])
-        span=' '+label
-    script.
-      document.body.addEventListener('touchstart', function(){ });
+    .mobile_author_icon
+      img.lozad(data-src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
+      .mobile_author-info__description= config.description
+    hr
+    .menus_item
+      each value, label in theme.menu
+        a.site-page(href=value.split('||')[0])
+          i.fa-fw(class=value.split('||')[1])
+          span=' '+label
+      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
--- a/layout/includes/widget/card_announcement.pug
+++ b/layout/includes/widget/card_announcement.pug
@@ -0,0 +1,6 @@
+.card_widget.card-announcement
+  .card-content
+    .item_headline
+      i.fa.fa-bullhorn.card-announcement-animation(aria-hidden="true")
+      span= _p('aside.card_announcement')
+    .announcement_content= theme.announcement.content
--- a/layout/includes/widget/card_archives.pug
+++ b/layout/includes/widget/card_archives.pug
@@ -0,0 +1,6 @@
+.card_widget.card-archives
+  .card-content
+    .item_headline
+      i.fa.fa-archive(aria-hidden="true")
+      span= _p('aside.card_archives')
+    div.archives_item!= list_archives({type:'monthly',format: 'YYYY年MM月'})
--- a/layout/includes/widget/card_author.pug
+++ b/layout/includes/widget/card_author.pug
@@ -0,0 +1,41 @@
+.card_widget.card-author
+  .card-content
+    .post_data
+      .data-item.text-center
+        img.lozad(data-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
+
+    .post_data.data_config
+      if site.posts.length
+        .data-item.text-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_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_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'
+      
+  
+  
+    if(theme.social)
+      .post_data.data_config
+        #aside-social-icons 
+          each url, icon in theme.social
+            a.social-icon.data-item(href=url target="_blank")
+              i(class=icon)
--- a/layout/includes/widget/card_categories.pug
+++ b/layout/includes/widget/card_categories.pug
@@ -0,0 +1,22 @@
+.card_widget.card-categories
+    .card-content
+      .item_headline
+        i.fa.fa-folder-open(aria-hidden="true")
+        span= _p('aside.card_categories')
+      ul.aside_category_item        
+        mixin displayCategories(parent = undefined) 
+          - site.categories.find({ parent }).sort("name").each(function(category) {
+              - var childCount = site.categories.find({ parent: category._id }).count();              
+              li.aside_category_list
+                a.aside_category_list_link(href=url_for(category.path))
+                  span.aside_category_list_name= category.name
+                  span.aside_category_list_length= category.length
+                
+              if childCount > 0
+                ul.aside_category_item.child
+                  +displayCategories(category._id)
+          - })
+
+        +displayCategories()
+
+ 
--- a/layout/includes/widget/card_recent_post.pug
+++ b/layout/includes/widget/card_recent_post.pug
@@ -0,0 +1,24 @@
+.card_widget.card-recent-post
+  .card-content
+    .item_headline
+      i.fa.fa-history(aria-hidden="true")
+      span= _p('aside.card_recent_post')
+    .aside_recent_item
+      - site.posts.sort('date', -1).limit(5).each(function(article){
+        .aside_recent_post
+          - var link = article.link || article.path
+            a(href=url_for(link))
+              - var post_cover = article.cover
+              - var default_post_cover = theme.default_cover
+              .aside_post_cover
+                if (post_cover)
+                  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.lozad(data-src=`${default_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)
+                  - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
+                  time.aside_post_meta.post-meta__date #[=date(article[date_type], config.date_format)]
+    
+      - })
--- a/layout/includes/widget/card_tags.pug
+++ b/layout/includes/widget/card_tags.pug
@@ -0,0 +1,6 @@
+.card_widget.card-tags
+  .card-content
+    .item_headline
+      i.fa.fa-tags(aria-hidden="true")
+      span= _p('aside.card_tags')
+    .card-tag-cloud!= tagcloud({min_font: 16, max_font: 24, amount: 200, color: true, start_color: '#999', end_color: '#000'})
--- a/layout/includes/widget/card_webinfo.pug
+++ b/layout/includes/widget/card_webinfo.pug
@@ -0,0 +1,24 @@
+.card_widget.card-webinfo
+  .card-content
+    .item_headline
+        i.fa.fa-line-chart(aria-hidden="true")
+        span= _p('aside.card_webinfo.headline')
+    .webinfo
+      .webinfo_item
+        .webinfo_article_name= _p('aside.card_webinfo.article_name') + " :"
+        .webinfo_article_count= site.posts.length      
+      if theme.runtimeshow.enable
+        .webinfo_item
+          .webinfo_runtime_name= _p('aside.card_webinfo.runtime_name') + " :"
+          #webinfo_runtime_count.webinfo_runtime_count
+          script#runtionshow(src=url_for('js/runtimeshow.js') start_date=theme.runtimeshow.start_date)       
+      
+      if theme.busuanzi.site_uv 
+        .webinfo_item       
+          .webinfo_site_uv_name= _p('aside.card_webinfo.site_uv_name') + " :"
+          .webinfo_site_uv_count#busuanzi_value_site_uv
+      if theme.busuanzi.site_pv
+        .webinfo_item
+          .webinfo_site_name= _p('aside.card_webinfo.site_pv_name') + " :"
+          .webinfo_site_pv_count#busuanzi_value_site_pv
+