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

package-lock.json

@@ -8684,9 +8684,9 @@
       }
     },
     "vditor": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-3.2.1.tgz",
-      "integrity": "sha512-mkyKNKhzpyeBYYjnD9u6Fbo8zYpXbHd416IJi9hiDfocgH39KeWLnm42uIr+XschfQF7w6vewcLD55D+knOYCQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-3.2.3.tgz",
+      "integrity": "sha512-sGKmwXlIwK7+HuFXxzqms6O4M7huPhV2wLJZV03oCPWfShoAHPpJwI9qzclgNwlTMcTq5mlOEcX4eIooTEsLLg==",
       "requires": {
         "diff-match-patch": "^1.0.4"
       }

package.json

@@ -55,6 +55,6 @@
     "nprogress": "^0.2.0",
     "uvstat": "^1.0.7",
     "vcmt": "^1.2.0",
-    "vditor": "^3.2.1"
+    "vditor": "^3.2.3"
   }
 }

src/main/resources/js/common.js

@@ -306,7 +306,7 @@ window.Util = {
   loadVditor: function (cb) {
     $.ajax({
       method: 'GET',
-      url: 'https://cdn.jsdelivr.net/npm/vditor@3.2.1/dist/index.min.js',
+      url: 'https://cdn.jsdelivr.net/npm/vditor@3.2.3/dist/index.min.js',
       dataType: 'script',
       cache: true,
       success: () => {

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

@@ -55,7 +55,7 @@ html {
 }
 
 body {
-  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-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "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;