From d7a22c873a4ad1b06b252fa5f8b1129850320af9 Mon Sep 17 00:00:00 2001
From: Celeste6666 <aafree2014@gmail.com>
Date: Mon, 16 Jan 2023 16:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=AE=8A=20Menu=20=E6=9C=AA=E9=BB=9E?=
 =?UTF-8?q?=E9=81=B8=E7=9A=84=E6=A8=A3=E5=BC=8F=E7=8B=80=E6=85=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Backend/Controllers/DeviceImportController.cs |  1 +
 Frontend/css/site.css                         | 11 ++++++++---
 Frontend/index.html                           |  2 +-
 Frontend/lib/skins/skin-master.css            |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Backend/Controllers/DeviceImportController.cs b/Backend/Controllers/DeviceImportController.cs
index 66cd110..39cab47 100644
--- a/Backend/Controllers/DeviceImportController.cs
+++ b/Backend/Controllers/DeviceImportController.cs
@@ -810,6 +810,7 @@ namespace Backend.Controllers
               }
               //更新device資料表  room_dbid 欄位
               string sql = @"
+                        SET SQL_SAFE_UPDATES = 0;
                         UPDATE
                           device AS de,
                           (
diff --git a/Frontend/css/site.css b/Frontend/css/site.css
index 7c0e702..dc8c17b 100644
--- a/Frontend/css/site.css
+++ b/Frontend/css/site.css
@@ -85,9 +85,14 @@ input:-webkit-autofill { background-color: rgba(0, 0, 0, 0.15) !important; }
 .yt-navbar-content ul { padding: 1rem 0rem; list-style-type: none; }
 .yt-navbar-content ul li { position: relative; display: flex; flex-wrap: wrap; }
 .yt-navbar-content ul li a { font-size: 0.9rem; padding: 0.75rem 2rem; position: relative; width: 100%; }
-.yt-navbar-content ul li a:hover { background-color: var(--theme-fusion-600); }
-.yt-navbar-content ul li a:active, .yt-navbar-content ul li a.active { background-color: var(--theme-fusion-500); }
-
+  .yt-navbar-content ul li a:hover {
+    background-color: var(--theme-fusion-600);
+    color: var(--theme-primary-50) !important;
+  }
+  .yt-navbar-content ul li a:active, .yt-navbar-content ul li a.active {
+    background-color: var(--theme-fusion-500);
+    color: var(--theme-primary-500) !important;
+  }
 .card-header.p-3.ui-draggable-handle:hover { cursor: move; }
 
 .device-wrap .card-body #info, .device-wrap .card-body #errRec, .device-wrap .card-body #opeRec { min-width: 500px; }
diff --git a/Frontend/index.html b/Frontend/index.html
index a311627..5db7e0a 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -1555,7 +1555,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
 
                 } else {
                     let strHtml = `<div class="btn-group mx-4">
-                                                                    <a href="javascript:;" name="topFunBtn" data-page="dashboard" data-tabname="topFunBtn" class="text-center">
+                                                                    <a href="javascript:;" name="topFunBtn" data-page="dashboard" data-tabname="topFunBtn" class="text-center active">
                                                                         <i class="fal fa-home fa-2x"></i><br>首頁
                                                                     </a>
                                                                     <!--<div class="dropdown-menu">
diff --git a/Frontend/lib/skins/skin-master.css b/Frontend/lib/skins/skin-master.css
index e839912..d8e6611 100644
--- a/Frontend/lib/skins/skin-master.css
+++ b/Frontend/lib/skins/skin-master.css
@@ -302,7 +302,7 @@ body:not(.mod-skin-light):not(.mod-skin-dark) #skin-default:before {
   .mod-skin-dark:not(.mod-skin-light) .page-content-wrapper a:not(.btn):not(.badge):not(.dropdown-item):not(.nav-link):not(.navbar-brand):not(.card-title):not([class*="fc-"]):not([class*="text-"]):not(.btn-search-close),
   .mod-skin-dark:not(.mod-skin-light) .modal-body a:not(.btn):not(.badge):not(.dropdown-item):not(.nav-link):not(.page-link):not(.navbar-brand):not(.card-title) {
     color: #ffffff;
-    color: var(--theme-primary-200); }
+    /*color: var(--theme-primary-200);*/ }
   .mod-skin-dark:not(.mod-skin-light) .text-success {
     color: var(--theme-success-300) !important; }
   .mod-skin-dark:not(.mod-skin-light) .text-danger {