Merge remote-tracking branch 'origin/dev' into dev

package-lock.json

@@ -8664,9 +8664,9 @@
       }
     },
     "vcmt": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/vcmt/download/vcmt-1.1.2.tgz?cache=0&sync_timestamp=1583413738864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvcmt%2Fdownload%2Fvcmt-1.1.2.tgz",
-      "integrity": "sha1-ZCQHMHI2qwppT7BaR8ypgqkD5HQ=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/vcmt/-/vcmt-1.1.3.tgz",
+      "integrity": "sha512-4Mk4OKFaRSHEsNkynq4S8mgtFBfcmtogNVhaJ0DNEb4Z9XQxdMNQyzCiSAwgaxhz66p1j71XI96EAcAThg2Mow==",
       "requires": {
         "jquery": "^3.4.1"
       }

package.json

@@ -48,7 +48,7 @@
     "jquery": "^3.4.1",
     "nprogress": "^0.2.0",
     "uvstat": "^1.0.7",
-    "vcmt": "^1.1.2",
+    "vcmt": "^1.1.3",
     "vditor": "^3.0.0"
   }
 }

src/main/resources/skins/metro-hot/article-list.ftl

@@ -56,7 +56,7 @@
                     ${article.articleTitle}
                 </a>
             </h2>
-            <div class="vditor-reset vditor-reset--dark">
+            <div class="vditor-reset">
                 ${article.articleAbstractText}
             </div>
             <div data-ico="&#x003b;" title="${tagLabel}" class="article-tags">

src/main/resources/skins/metro-hot/article.ftl

@@ -74,7 +74,7 @@
             </div>
             <div class="fn-clear">
                 <div class="main">
-                    <div class="vditor-reset vditor-reset--dark">
+                    <div class="vditor-reset">
                         ${article.articleContent}
                         <#if "" != article.articleSign.signHTML?trim>
                         ${article.articleSign.signHTML}

src/main/resources/skins/metro-hot/common-comment.ftl

@@ -43,6 +43,6 @@
             ${comment.commentDate2?string("yy-MM-dd HH:mm")}
             </div>
         </div>
-        <div class="vditor-reset vditor-reset--dark">${comment.commentContent}</div>
+        <div class="vditor-reset">${comment.commentContent}</div>
     </div>
 </div>

src/main/resources/skins/metro-hot/css/base.scss

@@ -20,7 +20,7 @@
  * skin metro-hot style
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 2.3.0.1, Feb 9, 2020
+ * @version 2.3.1.0, Mar 19, 2020
  */
 @import "../../../scss/toc";
 @import "../../../scss/usite";
@@ -61,7 +61,7 @@ html {
 }
 
 body {
-  font-family: Verdana, arial, '\5fae\8f6f\96c5\9ed1';
+  font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Segoe UI Symbol", "Android Emoji", "EmojiSymbols";
   font-size: 12px;
   background-color: #292929;
   margin: 0;
@@ -575,7 +575,7 @@ textarea {
   width: 60px;
 }
 
-.online-count{
+.online-count {
   background-color: #20608E;
 }
 
@@ -751,6 +751,21 @@ textarea {
   word-break: break-all;
   font-size: 14px;
   word-wrap: break-word;
+  --border-color: #141414;
+  --second-color: hsla(0, 0%, 72.5%, 0.36);
+  --panel-background-color: #24292e;
+  --toolbar-background-color: #1d2125;
+  --toolbar-icon-color: #b9b9b9;
+  --toolbar-icon-hover-color: #fff;
+  --textarea-background-color: #2f363d;
+  --textarea-text-color: #d1d5da;
+  --resize-icon-color: var(--border-color);
+  --resize-background-color: var(--second-color);
+  --resize-hover-icon-color: var(--toolbar-icon-hover-color);
+  --resize-hover-background-color: hsla(0, 0%, 72.5%, 0.86);
+  --code-background-color: rgba(66, 133, 244, 0.36);
+  --heading-border-color: var(--textarea-text-color);
+  --blockquote-color: var(--toolbar-icon-color);
 
   &::-webkit-scrollbar {
     display: none;
@@ -770,6 +785,8 @@ pre.prettyprint {
 
 /* start comment */
 #vcomment {
+  margin-bottom: 20px;
+
   .vcomment {
 
     &__item {

src/main/resources/skins/metro-hot/macro-side.ftl

@@ -52,7 +52,7 @@
             </#if>
 
             <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
-                <div class="vditor-reset vditor-reset--dark" style="margin-top: 20px">
+                <div class="vditor-reset" style="margin-top: 20px">
                     <#include "../../common-template/toc.ftl"/>
                 </div>
             </#if>