fix #12917

package-lock.json

@@ -5340,9 +5340,9 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "terser": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.3.tgz",
-      "integrity": "sha512-Nzr7dpRjSzMEUS+z2UYQBtzE0LDm5k0Yy8RgLRPy85QUo1TjU5lIOBwzS5/FVAMaVyHZ3WTTU2BuQcMn8KXnNQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.4.tgz",
+      "integrity": "sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q==",
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -5749,9 +5749,9 @@
       "dev": true
     },
     "vditor": {
-      "version": "1.8.13",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.13.tgz",
-      "integrity": "sha512-opowrsbyvyyNNuugUl2ImvPjYehn4FwM5M6FBEfc9AitU2UVd7ZHsE5VJMJ1LiZ05uDL5eG2i7hftwmwMrfyDQ==",
+      "version": "1.8.15",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.15.tgz",
+      "integrity": "sha512-OKVxeK2NPpC293MH3T4kOSt4vOUTURUsLoGO77m2ZlCsXTlJvZRmTyLLloTKN3n+ulqItErZBkfmBYvmzLqtcA==",
       "requires": {
         "abcjs": "^5.8.0",
         "diff-match-patch": "^1.0.4",

package.json

@@ -36,6 +36,6 @@
     "gulp-uglify": "^3.0.2"
   },
   "dependencies": {
-    "vditor": "^1.8.13"
+    "vditor": "^1.8.15"
   }
 }

src/main/webapp/admin/admin-preference.ftl

@@ -39,7 +39,8 @@
 <div id="tabPreferencePanel" class="sub-tabs-main">
     <div id="tabPreferencePanel_config" class="form">
         <div class="fn__clear">
-            <a style="line-height: 32px" href="https://hacpai.com/settings" target="_blank">前往配置 GitHub，Twitter 等站点链接</a>
+            <a style="line-height: 32px" href="https://hacpai.com/settings" target="_blank">前往配置 GitHub，Twitter
+                等站点链接</a>
             <button onclick="admin.preference.update()" class="fn__right">${updateLabel}</button>
         </div>
         <div class="fn__clear"></div>
@@ -60,31 +61,40 @@
         <label for="footerContent">${footerContent1Label}</label>
         <textarea rows="2" id="footerContent"></textarea><br><br>
         <div class="fn__clear">
-            <a style="line-height: 32px" href="https://hacpai.com/settings" target="_blank">前往配置 GitHub，Twitter 等站点链接</a>
+            <a style="line-height: 32px" href="https://hacpai.com/settings" target="_blank">前往配置 GitHub，Twitter
+                等站点链接</a>
             <button onclick="admin.preference.update()" class="fn__right">${updateLabel}</button>
         </div>
     </div>
     <div id="tabPreferencePanel_setting" class="fn__none form">
         <button class="fn__right" onclick="admin.preference.update()">${updateLabel}</button>
         <div class="fn__clear"></div>
-        <label for="localeString">${localeString1Label}</label>
+        <div class="fn__flex">
+            <div class="fn__flex-1">
+                <label>
+                    ${localeString1Label}
                     <select id="localeString">
                         <option value="zh_CN">简体中文</option>
                         <option value="en_US">Englisth(US)</option>
                     </select>
-        <label for="timeZoneId">${timeZoneId1Label}</label>
+                </label>
+                <label>
+                    ${timeZoneId1Label}
                     <select id="timeZoneId">
                         ${timeZoneIdOptions}
                     </select>
-        <label for="articleListDisplay">${articleListDisplay1Label}</label>
+                </label>
+                <label>
+                    ${articleListDisplay1Label}
                     <select id="articleListDisplay">
                         <option value="titleOnly">${titleOnlyLabel}</option>
                         <option value="titleAndAbstract">${titleAndAbstractLabel}</option>
                         <option value="titleAndContent">${titleAndContentLabel}</option>
                     </select>
-        <label for="hljsTheme">
-            <a href="https://xyproto.github.io/splash/docs/longer/all.html" target="_blank">${previewLabel}</a>${hljsThemeLabel}
                 </label>
+                <label>
+                    <a href="https://xyproto.github.io/splash/docs/longer/all.html"
+                       target="_blank">${previewLabel}</a>${hljsThemeLabel}
                     <select id="hljsTheme">
                         <option value="abap">abap</option>
                         <option value="algol">algol</option>
@@ -123,35 +133,22 @@
                         <option value="vs">vs</option>
                         <option value="xcode">xcode</option>
                     </select>
-        <label for="mostUsedTagDisplayCount">${indexTagDisplayCnt1Label}</label>
-        <input id="mostUsedTagDisplayCount" class="normalInput" type="text"/>
-        <label for="recentCommentDisplayCount">${indexRecentCommentDisplayCnt1Label}</label>
-        <input id="recentCommentDisplayCount" class="normalInput" type="text"/>
-        <label for="mostCommentArticleDisplayCount">${indexMostCommentArticleDisplayCnt1Label}</label>
-        <input id="mostCommentArticleDisplayCount" class="normalInput" type="text"/>
-        <label for="mostViewArticleDisplayCount">${indexMostViewArticleDisplayCnt1Label}</label>
-        <input id="mostViewArticleDisplayCount" class="normalInput" type="text"/>
-        <label for="articleListDisplayCount">${pageSize1Label}</label>
-        <input id="articleListDisplayCount" class="normalInput" type="text"/>
-        <label for="articleListPaginationWindowSize">${windowSize1Label}</label>
-        <input id="articleListPaginationWindowSize" class="normalInput" type="text"/>
-        <label for="randomArticlesDisplayCount">${randomArticlesDisplayCnt1Label}</label>
-        <input id="randomArticlesDisplayCount" class="normalInput" type="text"/>
-        <label for="relevantArticlesDisplayCount">${relevantArticlesDisplayCnt1Label}</label>
-        <input id="relevantArticlesDisplayCount" class="normalInput" type="text"/>
-        <label for="externalRelevantArticlesDisplayCount">${externalRelevantArticlesDisplayCnt1Label}</label>
-        <input id="externalRelevantArticlesDisplayCount" class="normalInput" type="text"/>
-        <label for="feedOutputMode">${feedOutputModel1Label}</label>
+                </label>
+                <label>
+                    ${feedOutputModel1Label}
                     <select id="feedOutputMode">
                         <option value="abstract">${abstractLabel}</option>
                         <option value="fullContent">${fullContentLabel}</option>
                     </select>
-        <label for="feedOutputCnt">${feedOutputCnt1Label}</label>
-        <input id="feedOutputCnt" class="normalInput" type="text"/>
-        <label for="faviconURL">Favicon</label>
+                </label>
+                <label>
+                    Favicon
                     <input id="faviconURL" class="normalInput" type="text"/>
-        <label for="customVars">${customVars1Label}</label>
+                </label>
+                <label>
+                    ${customVars1Label}
                     <input id="customVars" class="normalInput" type="text"/>
+                </label>
                 <label>
                     <div class="fn__flex-inline">
                         ${enableArticleUpdateHint1Label}
@@ -182,6 +179,51 @@
                         <input id="pullGitHub" type="checkbox" class="normalInput"/>
                     </div>
                 </label>
+            </div>
+            <div class="fn__margin12"></div>
+            <div class="fn__flex-1">
+                <label>
+                    ${indexTagDisplayCnt1Label}
+                    <input id="mostUsedTagDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${indexRecentCommentDisplayCnt1Label}
+                    <input id="recentCommentDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${indexMostCommentArticleDisplayCnt1Label}
+                    <input id="mostCommentArticleDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${indexMostViewArticleDisplayCnt1Label}
+                    <input id="mostViewArticleDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${randomArticlesDisplayCnt1Label}
+                    <input id="randomArticlesDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${relevantArticlesDisplayCnt1Label}
+                    <input id="relevantArticlesDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${externalRelevantArticlesDisplayCnt1Label}
+                    <input id="externalRelevantArticlesDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${pageSize1Label}
+                    <input id="articleListDisplayCount" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${windowSize1Label}
+                    <input id="articleListPaginationWindowSize" class="normalInput" type="text"/>
+                </label>
+                <label>
+                    ${feedOutputCnt1Label}
+                    <input id="feedOutputCnt" class="normalInput" type="text"/>
+                </label>
+            </div>
+        </div>
         <button class="fn__right" onclick="admin.preference.update()">${updateLabel}</button>
         <div class="fn__clear"></div>
     </div>

skins @ 8e70bda3

-Subproject commit da36b64ab0a9d33b941adb7c7cad0e032af7bc8f
+Subproject commit 8e70bda33f9690f5b8e4b293630052ba4b4d036d