🏷️ 更新2.3.0

layout/404.pug

@@ -20,11 +20,5 @@ html(lang=config.language data-theme=theme.display_mode)
         h1#error_title= '404'
         #error_subtitle= theme.error_404.subtitle
     include includes/rightside.pug
-<<<<<<< HEAD
-    include includes/search/index.pug
-    each item in theme.CDN_USE.js
-      script(src=url_for(item))
-=======
     !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
->>>>>>> dev
     include includes/additional-js.pug

layout/includes/additional-js.pug

@@ -66,13 +66,9 @@ if theme.mermaid.enable
   include ./math/mermaid.pug
 
 if is_home()
-<<<<<<< HEAD
-  include ./head/subtitle.pug
-=======
   include ./head/subtitle.pug
 
 !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
 if theme.preloader
-  !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
->>>>>>> dev
+  !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})

layout/includes/head.pug

@@ -10,16 +10,10 @@
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 
-<<<<<<< HEAD
-- var pageDescription = page.description || page.title || config.description
-- var pageKeywords
-- if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
-=======
 - var pageDescription = page_description()
 - var pageKeywords
 - if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
 - else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
->>>>>>> dev
 - else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
@@ -106,8 +100,5 @@ if theme.blog_title_font.font_link
 
 include ./head/config_site.pug
 include ./head/noscript.pug
-<<<<<<< HEAD
-=======
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
->>>>>>> dev
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/subtitle.pug

@@ -7,103 +7,117 @@ if theme.subtitle.enable
 
   if source == '1'
     script.
-      var subtitleEffect = !{subtitleEffect}
-      fetch('https://api.ooopn.com/ciba/api.php',)
-      .then(function (res){
-        return res.json();
-      })
-      .then(function (data) {
-        if (subtitleEffect){
-          var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-          var both = sub.unshift(data['ciba-en'],data.ciba)
-          var typed = new Typed("#subtitle", {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50
-          });
-        }else{
-          document.getElementById("subtitle").innerHTML = data['ciba-en']
-        }
-      })
-      .catch(function (err) {
-        console.error(err);
-      })
+      var subtitleType = function () {
+        var subtitleEffect = !{ subtitleEffect }
+        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',)
+          .then(function (res) {
+            return res.json()
+          })
+          .then(function (data) {
+            if (subtitleEffect) {
+              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+              var both = sub.unshift(data.text)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.text
+            }
+          })
+          .catch(function (err) {
+            console.error(err)
+          })
+      }
+      window.addEventListener('load', subtitleType)
 
   else if source == '2'
     script.
-      var subtitleEffect = !{subtitleEffect}
-      fetch('https://v1.hitokoto.cn')
-      .then(function (res){
-        return res.json();
-      })
-      .then(function (data) {
-        if (subtitleEffect){
-          var from = '出自 ' + data.from
-          var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-          var both = sub.unshift(data.hitokoto,from)  
-          var typed = new Typed("#subtitle", {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50
-          });
-        }else{
-          document.getElementById("subtitle").innerHTML = data.hitokoto        
-        }
-      })
-      .catch(function (err) {
-        console.error(err);
-      })
-
-  else if source == "3"
-    script(type="text/javascript" src="http://yijuzhan.com/api/word.php?m=js")
-    script.
-      var subtitleEffect = !{subtitleEffect}
-      var con = str[0];
-      if (subtitleEffect){
-        var from = "出自 " + str[1];
-        var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-        var both = sub.unshift(con,from)
-        var typed = new Typed("#subtitle", {
-          strings: sub,
-          startDelay: 300,
-          typeSpeed: 150,
-          loop: !{theme.subtitle.loop},
-          backSpeed: 50
-        });
-      }else{
-        document.getElementById("subtitle").innerHTML = con
+      var subtitleType = function () {
+        var subtitleEffect = !{ subtitleEffect }
+        fetch('https://v1.hitokoto.cn')
+          .then(function (res) {
+            return res.json()
+          })
+          .then(function (data) {
+            if (subtitleEffect) {
+              var from = '出自 ' + data.from
+              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+              var both = sub.unshift(data.hitokoto, from)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.hitokoto
+            }
+          })
+          .catch(function (err) {
+            console.error(err)
+          })
       }
+      window.addEventListener('load', subtitleType)
+
+  else if source == '3'
+    script.
+      var subtitleType = function () {
+        loadScript('http://yijuzhan.com/api/word.php?m=js', function () {
+          var subtitleEffect = !{ subtitleEffect }
+          var con = str[0]
+          if (subtitleEffect) {
+            var from = '出自 ' + str[1]
+            var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+            var both = sub.unshift(con, from)
+            var typed = new Typed('#subtitle', {
+              strings: sub,
+              startDelay: 300,
+              typeSpeed: 150,
+              loop: !{theme.subtitle.loop},
+              backSpeed: 50,
+            })
+          } else {
+            document.getElementById('subtitle').innerHTML = con
+          }
+        })
+      }
+      window.addEventListener('load', subtitleType)
 
   else if source == '4'
-    script(type="text/javascript" src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8")
     script.
-      var subtitleEffect = !{subtitleEffect}
-      jinrishici.load(function(result) {
-        if (subtitleEffect){
-          var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-          var content = result.data.content;
-          var both = sub.unshift(content)
-          var typed = new Typed("#subtitle", {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50
-          });
-        }else{
-          document.getElementById("subtitle").innerHTML = result.data.content        
-        }
-      })
+      var subtitleType = function () {
+        loadScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
+            var subtitleEffect = !{ subtitleEffect }
+            jinrishici.load(function (result) {
+              if (subtitleEffect) {
+                var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+                var content = result.data.content
+                var both = sub.unshift(content)
+                var typed = new Typed('#subtitle', {
+                  strings: sub,
+                  startDelay: 300,
+                  typeSpeed: 150,
+                  loop: !{theme.subtitle.loop},
+                  backSpeed: 50,
+                })
+              } else {
+                document.getElementById('subtitle').innerHTML = result.data.content
+              }
+            })
+          }
+        )
+      }
+      window.addEventListener('load', subtitleType)
 
   else
-    - var subtitle = theme.subtitle.sub[0]
     script.
       var subtitleEffect = !{subtitleEffect}
-      if (subtitleEffect){ 
+      if (subtitleEffect) { 
         var typed = new Typed("#subtitle", {
           strings: '!{theme.subtitle.sub}'.split(","),
           startDelay: 300,
@@ -111,6 +125,6 @@ if theme.subtitle.enable
           loop: !{theme.subtitle.loop},
           backSpeed: 50
         })
-      }else{
-        document.getElementById("subtitle").innerHTML = '!{subtitle}'
-        }
+      } else {
+        document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
+      }

layout/includes/header/header.pug

@@ -8,16 +8,6 @@
         a.site-page.social-icon.search
           i.fa.fa-search.fa-fw
           span=' '+_p('search')
-<<<<<<< HEAD
-    .menus_items
-      include ./menu_item.pug
-
-    span.toggle-menu.close
-      a.site-page
-        i.fa.fa-bars.fa-fw(aria-hidden="true")
-
-
-=======
     !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
 
     span.toggle-menu.close
@@ -25,4 +15,3 @@
         i.fa.fa-bars.fa-fw(aria-hidden="true")
 
 
->>>>>>> dev

layout/includes/header/index.pug

@@ -33,11 +33,7 @@ if theme.douban
         span#subtitle
       if(theme.social)
         #site_social_icons
-<<<<<<< HEAD
-          !=partial('includes/header/social', {}, {cache:theme.fragment_cache})
-=======
           !=fragment_cache('social', function(){return partial('includes/header/social')})
->>>>>>> dev
     #scroll_down
       i.fa.fa-angle-down.scroll-down-effects
   else if is_post()

layout/includes/header/post-info.pug

@@ -69,22 +69,14 @@
           span.disqus-comment-count.comment-count
             a(href=full_url_for(page.path) + '#disqus_thread')
         else if (theme.valine && theme.valine.enable && theme.valine.count && page.comments !== false)
-<<<<<<< HEAD
-          if (theme.busuanzi && theme.busuanzi.page_pv)
-=======
           if (postWordcount || theme.busuanzi.page_pv)
->>>>>>> dev
             span.post-meta__separator |
           i.post-meta__icon(class=commentCount aria-hidden="true")
           span= _p('post.comments') + ':'
           a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
             span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
         else if (theme.gitalk && theme.gitalk.enable && theme.gitalk.count && page.comments !== false)
-<<<<<<< HEAD
-          if (theme.busuanzi && theme.busuanzi.page_pv)
-=======
           if (postWordcount || theme.busuanzi.page_pv)
->>>>>>> dev
             span.post-meta__separator |
           i.post-meta__icon(class=commentCount aria-hidden="true")
           span= _p('post.comments') + ':'

layout/includes/layout.pug

@@ -41,17 +41,5 @@ html(lang=config.language data-theme=theme.display_mode)
         !=partial('includes/footer', {}, {cache:theme.fragment_cache})
 
     include ./rightside.pug
-
     !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
-<<<<<<< HEAD
-
-    each item in theme.CDN_USE.js
-      script(src=url_for(item))
-      
-    include ./additional-js.pug
-    
-
-    
-=======
-    include ./additional-js.pug
->>>>>>> dev
+    include ./additional-js.pug

layout/includes/mixins/post-ui.pug

@@ -62,16 +62,7 @@ mixin postUI(posts)
           .content!= expert
         else
           .content!= article.description
-<<<<<<< HEAD:layout/includes/mixins/UI.pug
-    
-    if theme.ad && theme.ad.index
-      if (index + 1) % 3 == 0
-        .recent-post-item.ad_height!=theme.ad.index
-
-  - })
-=======
 
     if theme.ad && theme.ad.index
       if (index + 1) % 3 == 0
         .recent-post-item.ad_height!=theme.ad.index
->>>>>>> dev:layout/includes/mixins/post-ui.pug

layout/includes/recent-posts.pug

@@ -1,67 +0,0 @@
-each article , index in page.posts.data
-  .recent-post-item
-    - var link = article.link || article.path
-    - var title = article.title || _p('no_title')
-    - var leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius'
-    - var post_cover = article.cover
-    - var no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
-    if post_cover && theme.cover.index_enable
-      .post_cover(class=leftOrRight)
-        a(href=url_for(link) title=title)      
-          if theme.lazyload.enable
-            img.post_bg.lazyload(data-src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
-          else
-            img.post_bg(src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
-    .recent-post-info(class=no_cover)
-      a.article-title(href=url_for(link) title=title)= title
-      .article-meta-wrap
-        if (article.top)
-          span.article-meta
-            i.fa.fa-thumb-tack.article-meta__icon.sticky
-            span.sticky= _p('sticky')
-            span.article-meta__separator |
-        if (theme.post_meta.page.date_type)
-          if (theme.post_meta.page.date_type === 'both')
-            time.post-meta__date
-              span.post-meta__date-created(title=_p('post.created') + ' ' + full_date(article.date))
-                i.fa.fa-calendar(aria-hidden="true")
-                =date(article.date, config.date_format)
-              span.article-meta__separator |
-              span.post-meta__date-updated(title=_p('post.updated') + ' ' + full_date(article.updated))
-                i.fa.fa-history(aria-hidden="true")
-                =date(article.updated, config.date_format)
-          else
-            - var data_type_updated = theme.post_meta.page.date_type === 'updated'
-            - var date_type = data_type_updated ? 'updated' : 'date'
-            - var date_icon = data_type_updated ? 'fa-history' :'fa-calendar'
-            - var date_title = data_type_updated ? _p('post.updated') : _p('post.created')
-            time.post-meta__date(title=date_title + ' ' + full_date(article[date_type]))
-              i.fa(class=date_icon aria-hidden="true")
-              =date(article[date_type], config.date_format)
-        if (theme.post_meta.page.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.post_meta.page.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) 
-        - content.length > theme.auto_excerpt.length ? expert += ' ...' : ''
-        .content!= expert
-      else
-        .content!= article.description
-
-  if theme.ad && theme.ad.index
-    if (index + 1) % 3 == 0
-      .recent-post-item.ad_height!=theme.ad.index

layout/includes/widget/card_author.pug

@@ -31,8 +31,4 @@
   
     if(theme.social)
         .card-info-social-icons.is-center
-<<<<<<< HEAD
-          include ../header/social.pug
-=======
           !=fragment_cache('social', function(){return partial('includes/header/social')}) 
->>>>>>> dev

layout/includes/widget/index.pug

@@ -9,11 +9,7 @@ if theme.aside.enable
         !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
       if theme.ad && theme.ad.aside
         !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-<<<<<<< HEAD
-      if theme.aside.card_categories
-=======
       if theme.aside.card_categories.enable
->>>>>>> dev
         !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
       if theme.aside.card_tags.enable
         !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})