From 6e3954f1e177d1422b953875cd429b5b266dfb9e Mon Sep 17 00:00:00 2001
From: mjsoftware <1406993111@qq.com>
Date: Mon, 12 Feb 2024 07:54:15 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                | 19 +++++++++----------
 src/css/style.less           | 12 +++++++++++-
 templates/common/navbar.html |  8 ++++----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index ac24fce..7847b8b 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -65,15 +65,14 @@ spec:
         - $formkit: group
           name: console
           label: 控制台
-          help: 仅支持pc端显示
           value:
-            pc_show_console: false
-            pc_console_icon: ri-equalizer-line
-            pc_console_title: 控制台
+            show_console: false
+            console_icon: ri-equalizer-line
+            console_title: 控制台
           children:
             - $formkit: radio
-              name: pc_show_console
-              id: pc_show_console
+              name: show_console
+              id: show_console
               label: 显示控制台
               options:
                 - label: 显示
@@ -81,12 +80,12 @@ spec:
                 - label: 隐藏
                   value: false
             - $formkit: text
-              name: pc_console_icon
-              if: $get(pc_show_console).value
+              name: console_icon
+              if: $get(show_console).value
               label: 控制台图标，留空显示默认图标
             - $formkit: text
-              name: pc_console_title
-              if: $get(pc_show_console).value
+              name: console_title
+              if: $get(show_console).value
               label: 控制台鼠标悬停提示，留空不显示
         - $formkit: radio
           name: load_progress
diff --git a/src/css/style.less b/src/css/style.less
index f318ab7..ad86296 100644
--- a/src/css/style.less
+++ b/src/css/style.less
@@ -3984,7 +3984,17 @@ button.swiper-pagination-bullet {
     }
 
     .navbar-console {
-      display: none;
+      float: right;
+      margin-left: 5px;
+      align-items: center;
+      justify-content: center;
+      display: flex;
+      background: transparent !important;
+
+      & > i {
+        font-size: 23px;
+        color: var(--main);
+      }
     }
   }
 }
diff --git a/templates/common/navbar.html b/templates/common/navbar.html
index fb2ee1d..511b764 100644
--- a/templates/common/navbar.html
+++ b/templates/common/navbar.html
@@ -66,11 +66,11 @@
             <div th:if="${pluginFinder.available('PluginSearchWidget')}" class="navbar-search">
                 <button onclick="javascript:SearchWidget.open();" class="submit" aria-label="搜索按钮" style="border-radius: 17px;"><i class="ri-search-line"></i></button>
             </div>
-            <a th:if="${theme.config.basic_style.console.pc_show_console}" class="navbar-console" href="/console" target="_blank"
-               th:title="${theme.config.basic_style.console.pc_console_title}">
-                <i th:class="${#strings.defaultString(theme.config.basic_style.console.pc_console_icon, 'ri-equalizer-line')}"></i>
-            </a>
             <i class="ri-search-line navbar-searchicon" onclick="javascript:SearchWidget.open();"></i>
+            <a th:if="${theme.config.basic_style.console.show_console}" class="navbar-console" href="/console" target="_blank"
+               th:title="${theme.config.basic_style.console.console_title}">
+                <i th:class="${#strings.defaultString(theme.config.basic_style.console.console_icon, 'ri-equalizer-line')}"></i>
+            </a>
         </div>
     </div>