Merge branch 'master' into docs

# Conflicts:
#	_config.yml

_config.yml

@@ -5,7 +5,7 @@ info:
   docs: https://xaoxuu.com/wiki/volantis/
   cdn: # 要使用CDN，请在根目录的config文件中写上 use_cdn: true
     css:
-      # style: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.25/css/style.css
+      style: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.27/css/style.css
     js:
       app: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.22/js/app.js
       search: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.22/js/search.js
@@ -46,12 +46,12 @@ style:
 # 幻灯片背景
 backstretch:
   position: background  # cover: 封面背景   background: 整个网页背景
-  duration: 6000        # 持续时间（毫秒）
+  duration: 10000       # 持续时间（毫秒）
   fade: 2500            # 渐变（毫秒）
-  is_dark: true         # 图片是否是暗色的（调整文字为白色）
+  is_dark: # true         # 图片是否是暗色的（调整文字为白色）
   images:
-    # - https://i.loli.net/2020/02/08/HNuVoted2mUxILl.jpg
-    - https://i.loli.net/2020/02/08/dNJyR4LHtarTqPu.jpg
+    - https://i.loli.net/2020/02/08/HNuVoted2mUxILl.jpg
+    # - https://i.loli.net/2020/02/08/dNJyR4LHtarTqPu.jpg
     # - https://i.loli.net/2020/02/08/yXx4GwgZYdi81Qs.jpg
     # - https://i.loli.net/2020/02/08/RP7JpGvWaCYfuB6.jpg
 

source/less/_article.less

@@ -2,7 +2,7 @@
   color: @color_text_main;
   font-size: @fontsize_base;
   line-height: @lineheight_base;
-  word-break: break-all;
+  // word-break: break-all;
   word-wrap: break-word;
   img {
     position: relative;
@@ -242,22 +242,30 @@
     p{
       text-align: left;
       word-wrap: normal;
-      margin: 0;
       font-size: @fontsize_small;
       line-height: @fontsize_small * 1.5;
-      padding: @gap/2 0;
+      margin: .6em 0;
     }
     position: relative;
     width: 100%;
     font-size: @fontsize_small;
-
     margin: .6em 0;
     padding: .7em 1.2em;
 
     .enable-trans();
     footer {
-      strong {
-        margin-right: 7px;
+      padding: 0;
+      text-align: justify;
+      color: inherit;
+      font-style: italic;
+      margin: .6em 0;
+      cite{
+        &::before{
+          content: '----';
+          padding: 0 .3em;
+        }
+        color: fade(@color_text_main, 70%);
+        margin-left: 1em;
       }
     }
     &.pullquote{
@@ -442,7 +450,7 @@
     }
 
   }
-  p btn {
+  p btn, li btn {
     a {
       background: @color_text_link;
       color: @color_text_in_header;

source/less/_main.less

@@ -28,7 +28,7 @@
       columns: 320px; // 支持多列
     }
     :first-child{
-      margin-top: 0;
+      // margin-top: 0;
     }
   }
   ul.popular-posts{
@@ -106,7 +106,6 @@
         p{
           text-align: left;
           word-wrap: normal;
-          margin: 0;
           font-size: @fontsize_small;
           line-height: @fontsize_small * 1.5;
         }