🏷️ 更新2.3.0

source/css/_global/index.styl

@@ -192,13 +192,10 @@ img:not([src])
 
 .img-alt
   margin: -.5rem 0 .5rem
-<<<<<<< HEAD
-=======
   color: $font-black
 
   &:hover
     text-decoration: none !important
->>>>>>> dev
 
 // hexo tag video
 .video-container
@@ -222,11 +219,7 @@ img:not([src])
   font-size: 20px
 
 .post-ad
-<<<<<<< HEAD
-  margin: 2rem 0 !important
-=======
   margin: 2rem 0
->>>>>>> dev
 
 .ad_height
   display: block !important
@@ -239,11 +232,6 @@ img:not([src])
 #nav
   animation: nav-effect 1s
 
-<<<<<<< HEAD
-// #page-header
-// animation: header-effect 1s
-=======
->>>>>>> dev
 #site_title,
 #site_subtitle
   animation: titlescale 1s
@@ -284,14 +272,10 @@ if hexo-config('avatar.effect') == true
     animation: tocsidebarRtoL .4s
 
   .sidebar-toc__progress
-<<<<<<< HEAD
-    animation: tocsidebarRtoL .7s
-=======
     animation: tocsidebarRtoL .6s
->>>>>>> dev
 
   .sidebar-toc__content
-    animation: tocsidebarRtoL .9s
+    animation: tocsidebarRtoL .7s
 
 @keyframes scroll-down-effect
   0%
@@ -315,21 +299,6 @@ if hexo-config('avatar.effect') == true
     opacity: 1
     transform: translateY(0)
 
-<<<<<<< HEAD
-@keyframes header-effect
-  0%
-    opacity: 0
-
-  60%
-    opacity: 0
-    transform: translateY(-30px)
-
-  100%
-    opacity: 1
-    transform: translateY(0)
-
-=======
->>>>>>> dev
 @keyframes headerNoOpacity
   0%
     transform: translateY(-50px)

source/css/_layout/head.styl

@@ -246,24 +246,15 @@
           content: ''
 
         li
-<<<<<<< HEAD
-          padding: 1px 10px
           list-style: none
-          text-align: center
-=======
-          list-style: none
->>>>>>> dev
 
           &:hover
             background: $theme-color
 
           a
-<<<<<<< HEAD
-=======
             display: inline-block
             padding: .3rem .7rem
             width: 100%
->>>>>>> dev
             color: $font-black
             text-shadow: none
 
@@ -321,13 +312,9 @@
 
             .post-meta-pv-cv
               .post-meta__separator:first-child
-<<<<<<< HEAD
-                display: none
-=======
                 display: none
 
             if !hexo-config('busuanzi.page_pv')
               .post-meta-commentcount
                 .post-meta__separator
-                  display: none
->>>>>>> dev
+                  display: none

source/js/main.js

@@ -263,29 +263,11 @@ $(function () {
     /**
    * 代碼收縮
    */
-<<<<<<< HEAD
-  const $highlightTools = $('.highlight-tools')
-  if (isHighlightShrink === 'true') {
-    $highlightTools.append('<i class="fa fa-angle-down code-expand code-closed" aria-hidden="true"></i>')
-  } else if (isHighlightShrink === 'false') {
-    $highlightTools.append('<i class="fa fa-angle-down code-expand" aria-hidden="true"></i>')
-  }
-
-  $(document).on('click', '.highlight-tools >.code-expand', function () {
-    var $table = $(this).parent().next()
-    if ($(this).hasClass('code-closed')) {
-      $table.css('display', 'block')
-      $(this).removeClass('code-closed')
-    } else {
-      $table.css('display', 'none')
-      $(this).addClass('code-closed')
-=======
     const $highlightTools = $('.highlight-tools')
     if (isHighlightShrink === 'true') {
       $highlightTools.append('<i class="fa fa-angle-down code-expand code-closed" aria-hidden="true"></i>')
     } else if (isHighlightShrink === 'false') {
       $highlightTools.append('<i class="fa fa-angle-down code-expand" aria-hidden="true"></i>')
->>>>>>> dev
     }
 
     $(document).on('click', '.highlight-tools >.code-expand', function () {
@@ -790,21 +772,5 @@ $(function () {
         }
       }
     })
-<<<<<<< HEAD
-  })
-
-  function addPhotoFigcaption () {
-    var images = $('#article-container img')
-    images.each(function (i, o) {
-      var $this = $(o)
-      if ($this.attr('alt')) {
-        var t = $('<div class="img-alt is-center">' + $this.attr('alt') + '</div>')
-        $this.after(t)
-      }
-    })
   }
-  if (GLOBAL_CONFIG.isPhotoFigcaption) addPhotoFigcaption()
-=======
-  }
->>>>>>> dev
 })