Merge branch 'dev' into patch-abcjs

source/css/_layout/post.styl

@@ -144,15 +144,26 @@ beautify()
     p
       margin: 0 0 8px
 
+  > :last-child
+    margin-bottom: 0 !important
+
+  hr
+    margin: 20px 0
+
   if hexo-config('beautify.enable')
     if hexo-config('beautify.field') == 'site'
       beautify()
     else if hexo-config('beautify.field') == 'post'
       &.post-content
         beautify()
+  else
+    hr
+      margin: 20px 0
+      border: 1px inset
+      width 100%
 
-  > :last-child
-    margin-bottom: 0 !important
+      &:before
+        content: none
 
 #post
   .tag_share

source/css/_layout/third-party.styl

@@ -121,4 +121,8 @@ span.mathjax-overflow
   transition: opacity .3s
 
   &.abcjs-container
-    opacity: 1
+    opacity: 1
+ 
++maxWidth768()
+  .fancybox__toolbar__column.is-middle
+    display: none

source/css/_page/common.styl

@@ -18,7 +18,7 @@
     padding: 20px 5px
 
   +minWidth2000()
-    max-width: 1500px
+    max-width: 1700px
 
   & > div:first-child:not(.recent-posts)
     @extend .cardHover

source/css/_search/algolia.styl

@@ -26,12 +26,15 @@
         color: $search-keyword-highlight
         font-weight: bold
 
+    .algolia-hits-item-title
+      font-weight: 600
+
     .algolia-hit-item-content
       margin: 0 0 8px
       word-break: break-word
 
     .ais-Pagination
-      margin: 20px 0 0
+      margin: 15px 0 0
       padding: 0
       text-align: center
 
@@ -61,22 +64,16 @@
       .ais-Pagination-item--disabled
         visibility: hidden
 
-    .algolia-logo
-      padding-top: 2px
-      width: 80px
-      height: 30px
-
     #algolia-hits
       > div
         overflow-y: scroll
         margin: 0 -20px
         padding: 0 22px
-
-        +minWidth768()
-          max-height: calc(80vh - 240px)
+        max-height: calc(80vh - 240px)
 
         +maxWidth768()
-          height: calc(100vh - 260px)
+          max-height: none
+          height: calc(var(--search-height) - 265px)
 
     #algolia-info
       div
@@ -84,10 +81,7 @@
 
       .algolia-poweredBy
         float: right
+        vertical-align: text-top
 
-.apple
-  #algolia-search
-    #algolia-hits
-      > div
-        +maxWidth768()
-          height: calc(90vh - 260px)
+        svg
+          height: 1.1em

source/css/_search/index.styl

@@ -9,6 +9,7 @@
   width: 600px
   border-radius: 8px
   background: var(--search-bg)
+  --search-height: 100vh
 
   +maxWidth768()
     top: 0

source/css/_search/local-search.styl

@@ -18,7 +18,7 @@
     .search-wrap
       display: none
 
-    .local-search__hit-item
+    .local-search-hit-item
       position: relative
       padding-left: 24px
       line-height: 1.7
@@ -55,16 +55,20 @@
         margin: 0 0 8px
         word-break: break-word
 
-      .search-keyword
-        color: $search-keyword-highlight
-        font-weight: bold
-
     .search-result-list
       overflow-y: overlay
       margin: 0 -20px
       padding: 0 22px
-      max-height: calc(80vh - 130px)
+      max-height: calc(80vh - 200px)
 
       +maxWidth768()
-        padding-bottom: 40px
-        max-height: 75vh !important
+        max-height: calc(var(--search-height) - 220px) !important
+
+    .no-result
+      & + #local-search-stats-wrap
+        display: none
+
+.search-keyword
+  background: transparent
+  color: $search-keyword-highlight
+  font-weight: bold