From 88e412fda665d851843f52a1ffe112b74553e588 Mon Sep 17 00:00:00 2001
From: naiba <hi@nai.ba>
Date: Fri, 6 Aug 2021 11:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=8C=89=E9=92=AE=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E7=AD=89=E9=85=8D=E8=89=B2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/static/main.css                          |  6 +++++-
 resource/static/main.js                           | 14 +++++++-------
 resource/template/common/footer.html              |  2 +-
 resource/template/common/header.html              |  2 +-
 resource/template/common/menu.html                |  2 +-
 resource/template/component/confirm.html          |  2 +-
 resource/template/component/cron.html             |  2 +-
 resource/template/component/monitor.html          |  2 +-
 resource/template/component/notification.html     |  2 +-
 resource/template/component/rule.html             |  2 +-
 resource/template/component/server.html           |  2 +-
 resource/template/dashboard/cron.html             |  2 +-
 resource/template/dashboard/error.html            |  2 +-
 resource/template/dashboard/login.html            |  2 +-
 resource/template/dashboard/monitor.html          |  2 +-
 resource/template/dashboard/notification.html     |  4 ++--
 resource/template/dashboard/server.html           |  2 +-
 resource/template/theme-default/home.html         |  4 ++--
 resource/template/theme-default/viewpassword.html |  4 ++--
 resource/template/theme-hotaru/viewpassword.html  |  4 ++--
 20 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/resource/static/main.css b/resource/static/main.css
index fe22e2b..5cc6096 100644
--- a/resource/static/main.css
+++ b/resource/static/main.css
@@ -112,4 +112,8 @@
 
 .nezha-primary-font {
   color: #0338d6 !important;
-}
\ No newline at end of file
+}
+
+.nezha-secondary-font {
+  color: rgb(10, 148, 242) !important;
+}
diff --git a/resource/static/main.js b/resource/static/main.js
index 6f286b6..35a442e 100644
--- a/resource/static/main.js
+++ b/resource/static/main.js
@@ -7,7 +7,7 @@ function readableBytes(bytes) {
   return parseFloat((bytes / Math.pow(1024, i)).toFixed(2)) + sizes[i];
 }
 
-const confirmBtn = $(".mini.confirm.modal .positive.button");
+const confirmBtn = $(".mini.confirm.modal .nezha-primary-btn.button");
 
 function showConfirm(title, content, callFn, extData) {
   const modal = $(".mini.confirm.modal");
@@ -34,7 +34,7 @@ function showFormModal(modelSelector, formID, URL, getData) {
       closable: true,
       onApprove: function () {
         let success = false;
-        const btn = $(modelSelector + " .positive.button");
+        const btn = $(modelSelector + " .nezha-primary-btn.button");
         const form = $(modelSelector + " form");
         if (btn.hasClass("loading")) {
           return success;
@@ -106,7 +106,7 @@ function addOrEditAlertRule(rule) {
   const modal = $(".rule.modal");
   modal.children(".header").text((rule ? "修改" : "添加") + "报警规则");
   modal
-    .find(".positive.button")
+    .find(".nezha-primary-btn.button")
     .html(
       rule ? '修改<i class="edit icon"></i>' : '添加<i class="add icon"></i>'
     );
@@ -125,7 +125,7 @@ function addOrEditNotification(notification) {
   const modal = $(".notification.modal");
   modal.children(".header").text((notification ? "修改" : "添加") + "通知方式");
   modal
-    .find(".positive.button")
+    .find(".nezha-primary-btn.button")
     .html(
       notification
         ? '修改<i class="edit icon"></i>'
@@ -159,7 +159,7 @@ function addOrEditServer(server) {
   const modal = $(".server.modal");
   modal.children(".header").text((server ? "修改" : "添加") + "服务器");
   modal
-    .find(".positive.button")
+    .find(".nezha-primary-btn.button")
     .html(
       server ? '修改<i class="edit icon"></i>' : '添加<i class="add icon"></i>'
     );
@@ -184,7 +184,7 @@ function addOrEditMonitor(monitor) {
   const modal = $(".monitor.modal");
   modal.children(".header").text((monitor ? "修改" : "添加") + "监控");
   modal
-    .find(".positive.button")
+    .find(".nezha-primary-btn.button")
     .html(
       monitor ? '修改<i class="edit icon"></i>' : '添加<i class="add icon"></i>'
     );
@@ -223,7 +223,7 @@ function addOrEditCron(cron) {
   const modal = $(".cron.modal");
   modal.children(".header").text((cron ? "修改" : "添加") + "计划任务");
   modal
-    .find(".positive.button")
+    .find(".nezha-primary-btn.button")
     .html(
       cron ? '修改<i class="edit icon"></i>' : '添加<i class="add icon"></i>'
     );
diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html
index 4376a45..6face13 100644
--- a/resource/template/common/footer.html
+++ b/resource/template/common/footer.html
@@ -9,7 +9,7 @@
 <script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.1/dist/semantic.min.js"></script>
 <script src="/static/semantic-ui-alerts.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js"></script>
-<script src="/static/main.js?v202106302144"></script>
+<script src="/static/main.js?v20210806"></script>
 </body>
 
 </html>
diff --git a/resource/template/common/header.html b/resource/template/common/header.html
index f009dc0..c32f1ba 100644
--- a/resource/template/common/header.html
+++ b/resource/template/common/header.html
@@ -9,7 +9,7 @@
     <title>{{.Title}}</title>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.1/dist/semantic.min.css">
     <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
-    <link rel="stylesheet" type="text/css" href="/static/main.css?v20210806">
+    <link rel="stylesheet" type="text/css" href="/static/main.css?v2021080602">
     <link rel="shortcut icon" type="image/png" href="/static/logo.svg?v20210804" />
 </head>
 
diff --git a/resource/template/common/menu.html b/resource/template/common/menu.html
index 35863a9..8292a4f 100644
--- a/resource/template/common/menu.html
+++ b/resource/template/common/menu.html
@@ -40,7 +40,7 @@
                     </div>
                 </div>
                 {{else}}
-                <a href="/login" class="ui large nezha-primary-btn button"><i class="sign-in icon"></i>登录</a>
+                <a href="/login" class="ui large positive nezha-primary-btn button"><i class="sign-in icon"></i>登录</a>
                 {{end}}
             </div>
         </div>
diff --git a/resource/template/component/confirm.html b/resource/template/component/confirm.html
index 43ca780..3db8b45 100644
--- a/resource/template/component/confirm.html
+++ b/resource/template/component/confirm.html
@@ -5,7 +5,7 @@
     </div>
     <div class="actions">
         <div class="ui negative button">取消</div>
-        <button class="ui positive right labeled icon button">确认<i class="checkmark icon"></i>
+        <button class="ui positive nezha-primary-btn right labeled icon button">确认<i class="checkmark icon"></i>
         </button>
     </div>
 </div>
diff --git a/resource/template/component/cron.html b/resource/template/component/cron.html
index 1b11190..9b315f9 100644
--- a/resource/template/component/cron.html
+++ b/resource/template/component/cron.html
@@ -52,7 +52,7 @@
     </div>
     <div class=" actions">
         <div class="ui negative button">取消</div>
-        <button class="ui positive right labeled icon button">确认<i class="checkmark icon"></i>
+        <button class="ui positive nezha-primary-btn right labeled icon button">确认<i class="checkmark icon"></i>
         </button>
     </div>
 </div>
diff --git a/resource/template/component/monitor.html b/resource/template/component/monitor.html
index 81334f3..3aaa3cf 100644
--- a/resource/template/component/monitor.html
+++ b/resource/template/component/monitor.html
@@ -58,7 +58,7 @@
   </div>
   <div class="actions">
     <div class="ui negative button">取消</div>
-    <button class="ui positive right labeled icon button">
+    <button class="ui positive nezha-primary-btn right labeled icon button">
       确认<i class="checkmark icon"></i>
     </button>
   </div>
diff --git a/resource/template/component/notification.html b/resource/template/component/notification.html
index db1bfbc..97403c9 100644
--- a/resource/template/component/notification.html
+++ b/resource/template/component/notification.html
@@ -40,7 +40,7 @@
     </div>
     <div class="actions">
         <div class="ui negative button">取消</div>
-        <button class="ui positive right labeled icon button">确认<i class="checkmark icon"></i>
+        <button class="ui positive nezha-primary-btn right labeled icon button">确认<i class="checkmark icon"></i>
         </button>
     </div>
 </div>
diff --git a/resource/template/component/rule.html b/resource/template/component/rule.html
index 2990eaa..a9dd8ea 100644
--- a/resource/template/component/rule.html
+++ b/resource/template/component/rule.html
@@ -22,7 +22,7 @@
     </div>
     <div class="actions">
         <div class="ui negative button">取消</div>
-        <button class="ui positive right labeled icon button">确认<i class="checkmark icon"></i>
+        <button class="ui positive nezha-primary-btn right labeled icon button">确认<i class="checkmark icon"></i>
         </button>
     </div>
 </div>
diff --git a/resource/template/component/server.html b/resource/template/component/server.html
index 3eadc2a..e06781e 100644
--- a/resource/template/component/server.html
+++ b/resource/template/component/server.html
@@ -28,7 +28,7 @@
     </div>
     <div class=" actions">
         <div class="ui negative button">取消</div>
-        <button class="ui positive right labeled icon button">确认<i class="checkmark icon"></i>
+        <button class="ui positive nezha-primary-btn right labeled icon button">确认<i class="checkmark icon"></i>
         </button>
     </div>
 </div>
diff --git a/resource/template/dashboard/cron.html b/resource/template/dashboard/cron.html
index 65ba55d..92b862d 100644
--- a/resource/template/dashboard/cron.html
+++ b/resource/template/dashboard/cron.html
@@ -5,7 +5,7 @@
     <div class="ui container">
         <div class="ui grid">
             <div class="right floated right aligned twelve wide column">
-                <button class="ui right labeled positive icon button" onclick="addOrEditCron()"><i class="add icon"></i>
+                <button class="ui right labeled nezha-primary-btn icon button" onclick="addOrEditCron()"><i class="add icon"></i>
                     添加计划任务
                 </button>
             </div>
diff --git a/resource/template/dashboard/error.html b/resource/template/dashboard/error.html
index e12cff1..b23c8b7 100644
--- a/resource/template/dashboard/error.html
+++ b/resource/template/dashboard/error.html
@@ -3,7 +3,7 @@
 <div class="login nb-container">
     <div class="ui center aligned grid">
         <div class="column">
-            <h2 class="ui nezha-primary-font image header">
+            <h2 class="ui image header">
                 <img src="/static/logo.svg?v20210804" class="image">
                 <div class="content">
                     访问受限
diff --git a/resource/template/dashboard/login.html b/resource/template/dashboard/login.html
index 0fd5d17..4a27ef4 100644
--- a/resource/template/dashboard/login.html
+++ b/resource/template/dashboard/login.html
@@ -3,7 +3,7 @@
 <div class="login nb-container">
     <div class="ui center aligned grid">
         <div class="column">
-            <h2 class="ui nezha-primary-font image header">
+            <h2 class="ui image header">
                 <img src="static/logo.svg?v20210804" class="image">
                 <div class="content">
                     使用 {{.LoginType}} 账号登录
diff --git a/resource/template/dashboard/monitor.html b/resource/template/dashboard/monitor.html
index 164d080..b2980a9 100644
--- a/resource/template/dashboard/monitor.html
+++ b/resource/template/dashboard/monitor.html
@@ -4,7 +4,7 @@
   <div class="ui container">
     <div class="ui grid">
       <div class="right floated right aligned twelve wide column">
-        <button class="ui right labeled positive icon button" onclick="addOrEditMonitor()">
+        <button class="ui right labeled nezha-primary-btn icon button" onclick="addOrEditMonitor()">
           <i class="add icon"></i> 添加监控
         </button>
       </div>
diff --git a/resource/template/dashboard/notification.html b/resource/template/dashboard/notification.html
index 244af0c..8ebcc84 100644
--- a/resource/template/dashboard/notification.html
+++ b/resource/template/dashboard/notification.html
@@ -5,7 +5,7 @@
     <div class="ui container">
         <div class="ui grid">
             <div class="right floated right aligned twelve wide column">
-                <button class="ui right labeled positive icon button" onclick="addOrEditNotification()"><i
+                <button class="ui right labeled nezha-primary-btn icon button" onclick="addOrEditNotification()"><i
                         class="add icon"></i> 添加通知方式
                 </button>
             </div>
@@ -44,7 +44,7 @@
         </table>
         <div class="ui grid">
             <div class="right floated right aligned twelve wide column">
-                <button class="ui right labeled positive icon button" onclick="addOrEditAlertRule()"><i
+                <button class="ui right labeled nezha-primary-btn icon button" onclick="addOrEditAlertRule()"><i
                         class="add icon"></i>
                     添加报警规则
                 </button>
diff --git a/resource/template/dashboard/server.html b/resource/template/dashboard/server.html
index a363ffd..3972c9c 100644
--- a/resource/template/dashboard/server.html
+++ b/resource/template/dashboard/server.html
@@ -5,7 +5,7 @@
     <div class="ui container">
         <div class="ui grid">
             <div class="right floated right aligned twelve wide column">
-                <button class="ui right labeled positive icon button" onclick="addOrEditServer()"><i
+                <button class="ui right labeled nezha-primary-btn icon button" onclick="addOrEditServer()"><i
                         class="add icon"></i> 添加服务器
                 </button>
             </div>
diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
index ef9d436..3fb4935 100644
--- a/resource/template/theme-default/home.html
+++ b/resource/template/theme-default/home.html
@@ -34,7 +34,7 @@
                     class="freebsd icon"
                   ></i
                   >@#server.Name + (server.live?'':' [已离线]')#@
-                  <i class="yellow info circle icon"></i>
+                  <i class="nezha-secondary-font info circle icon"></i>
                   <div class="ui content popup" style="margin-bottom: 0">
                     系统：@#server.Host.Platform#@-@#server.Host.PlatformVersion#@
                     [<span v-if="server.Host.Virtualization"
@@ -160,7 +160,7 @@
           this.group()
       },
       mounted() {
-          $('.yellow.info.icon').popup({
+          $('.nezha-secondary-font.info.icon').popup({
               popup: '.ui.content.popup',
               exclusive: true,
           });
diff --git a/resource/template/theme-default/viewpassword.html b/resource/template/theme-default/viewpassword.html
index f309bfc..c78d78a 100644
--- a/resource/template/theme-default/viewpassword.html
+++ b/resource/template/theme-default/viewpassword.html
@@ -6,7 +6,7 @@
 <div class="login nb-container">
     <div class="ui center aligned grid">
         <div class="column">
-            <h2 class="ui nezha-primary-font image header">
+            <h2 class="ui image header">
                 <img src="static/logo.svg?v20210804" class="image">
                 <div class="content">
                     验证查看密码
@@ -16,7 +16,7 @@
                 <div class="field">
                     <input type="password" name="Password">
                 </div>
-                <button class="ui button" type="submit">确认</button>
+                <button class="ui nezha-primary-btn button" type="submit">确认</button>
             </form>
         </div>
     </div>
diff --git a/resource/template/theme-hotaru/viewpassword.html b/resource/template/theme-hotaru/viewpassword.html
index 7e622b9..cc2b1fb 100644
--- a/resource/template/theme-hotaru/viewpassword.html
+++ b/resource/template/theme-hotaru/viewpassword.html
@@ -6,7 +6,7 @@
 <div class="login nb-container">
     <div class="ui center aligned grid">
         <div class="column">
-            <h2 class="ui nezha-primary-font image header">
+            <h2 class="ui image header">
                 <img src="static/logo.svg?v20210804" class="image">
                 <div class="content">
                     验证查看密码
@@ -16,7 +16,7 @@
                 <div class="field">
                     <input type="password" name="Password">
                 </div>
-                <button class="ui button" type="submit">确认</button>
+                <button class="ui nezha-primary-btn button" type="submit">确认</button>
             </form>
         </div>
     </div>