Merge branch 'master' of https://github.com/xaoxuu/hexo-theme-volantis

_config.yml

@@ -1,7 +1,7 @@
 ############################### Theme Information ###############################
 info:
   name: Volantis # This is theme's name, not your blog's name.
-  version: '2.6.1' # This is theme's version.
+  version: '2.6.2' # This is theme's version.
   docs: https://volantis.js.org/ # This is theme's URL.
   cdn:
     css:

source/css/_base/index.styl

@@ -250,7 +250,7 @@ table
   td,th
     padding: 6px 16px
     border: 2px solid darken($color-block, 2)
-    line-height: 1.5
+    line-height: $lineheight-fixed
     font-size: 90%
   tr
     word-break: keep-all

source/css/_defines/fonts.styl

@@ -52,7 +52,8 @@ $fontsize-code = convert(hexo-config('style.fontsize.code')) || .8125rem  // 13p
 $fontsize-footnote = convert(hexo-config('style.fontsize.footnote')) || .75rem  // the smallest (12px)
 
 // line-height
-$lineheight = hexo-config('style.gap.line_height') || 2
+$lineheight = hexo-config('style.gap.line_height') || 1.75
+$lineheight-fixed = 1.5
 
 $fontsize-large = 3rem
 $fontsize-huge = 4rem

source/css/_highlight/index.styl

@@ -77,7 +77,7 @@ pre
   font-family: $fontfamily-code
   border-radius: $border-codeblock
   border: 1px solid darken($color-codeblock, 6)
-  line-height: 1.5
+  line-height: $lineheight-fixed
   trans()
   figcaption
     position: sticky
@@ -93,7 +93,7 @@ pre
     td,th
       padding: 0
       border: none
-      line-height: 1.5
+      line-height: $lineheight-fixed
     margin: 0
     background-color: transparent
     border: none
@@ -205,7 +205,6 @@ $hl-amber = #FD8607
 $hl-text = alpha($color-text, .9)
 .highlight pre
   // 行
-  // line-height: 1.5
   .line,.params
     color: $hl-text
 

source/css/_layout/article.styl

@@ -6,7 +6,7 @@
     >a,>p>a,blockquote a,div.note a
       underline()
     >ul>li,>ol>li,tbody tr td
-      >a
+      >a,>p>a
         underline()
     div.tab-pane
       >p,li
@@ -242,7 +242,7 @@
       font-size: $fontsize-meta
     figure
       font-size: 13px
-      line-height: 1.6em
+      line-height: $lineheight-fixed
 
 
   .widget

source/css/_tag-plugins/folding.styl

@@ -15,6 +15,7 @@ details
     font-size: $fontsize-meta
     font-weight: bold
     position: relative
+    line-height: $lineheight-fixed
     >
       p,h1,h2,h3,h4,h5,h6
         display: inline
@@ -92,7 +93,7 @@ details[open]
     margin: 0 - $gap
     margin-top: 0
     >
-      p,.tabs,ul,ol,.highlight,.note,.fancybox
+      p,.tabs,ul,ol,.highlight,.note,.fancybox,details
         &:first-child
           margin-top: 0
         &:last-child

source/css/_tag-plugins/tabs.styl

@@ -24,7 +24,7 @@ div.tabs
     padding: 8px 8px 0 8px
     background: $color-block
     border-radius: $tbr $tbr 0 0
-    line-height: 1.5
+    line-height: $lineheight-fixed
     li.tab
       list-style-type: none
       margin-top: 0