From 40d49f073602fb87b8cb902ffb56f42190299bce Mon Sep 17 00:00:00 2001
From: robin <luobing@zhianinfo.com>
Date: Sun, 15 Feb 2026 19:45:55 +0800
Subject: [PATCH] Sync code from main

---
 EdgeAdmin/web/views/@default/@layout_override.css |  2 +-
 .../web/views/@default/@layout_override.less      |  2 +-
 EdgeUser/web/views/@default/@layout_override.css  | 12 +++++++++++-
 EdgeUser/web/views/@default/@layout_override.less | 15 ++++++++++++++-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/EdgeAdmin/web/views/@default/@layout_override.css b/EdgeAdmin/web/views/@default/@layout_override.css
index ed4279a..a1006d1 100644
--- a/EdgeAdmin/web/views/@default/@layout_override.css
+++ b/EdgeAdmin/web/views/@default/@layout_override.css
@@ -79,7 +79,7 @@ body.swal2-shown {
 }
 :root {
   --admin-top-nav-bg: #0a1f3f;
-  --admin-side-menu-bg: #102a4d;
+  --admin-side-menu-bg: #1a4674;
 }
 .top-nav.theme1,
 .top-nav.theme2,
diff --git a/EdgeAdmin/web/views/@default/@layout_override.less b/EdgeAdmin/web/views/@default/@layout_override.less
index cc5a095..1e70c0c 100644
--- a/EdgeAdmin/web/views/@default/@layout_override.less
+++ b/EdgeAdmin/web/views/@default/@layout_override.less
@@ -110,7 +110,7 @@ body.swal2-shown {
 // Menu background colors only
 :root {
 	--admin-top-nav-bg: #0a1f3f;
-	--admin-side-menu-bg: #102a4d;
+	--admin-side-menu-bg: #1a4674;
 }
 
 .top-nav.theme1,
diff --git a/EdgeUser/web/views/@default/@layout_override.css b/EdgeUser/web/views/@default/@layout_override.css
index 30f8521..bcbc2b1 100644
--- a/EdgeUser/web/views/@default/@layout_override.css
+++ b/EdgeUser/web/views/@default/@layout_override.css
@@ -62,7 +62,7 @@ select.dropdown {
 }
 :root {
   --admin-top-nav-bg: #0a1f3f;
-  --admin-side-menu-bg: #102a4d;
+  --admin-side-menu-bg: #1a4674;
 }
 .top-nav,
 .top-nav.theme1,
@@ -101,6 +101,16 @@ select.dropdown {
   padding: 0 !important;
   margin: 0 !important;
 }
+.main-menu {
+  top: 2.6em !important;
+}
+.main-menu > .ui.menu > .item:first-child:empty {
+  display: none !important;
+  height: 0 !important;
+  min-height: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
 .left-box .menu .item.active {
   background: rgba(230, 230, 230, 0.35) !important;
   border-radius: 3px;
diff --git a/EdgeUser/web/views/@default/@layout_override.less b/EdgeUser/web/views/@default/@layout_override.less
index 0ed75ee..b5466cc 100644
--- a/EdgeUser/web/views/@default/@layout_override.less
+++ b/EdgeUser/web/views/@default/@layout_override.less
@@ -82,7 +82,7 @@ select.dropdown {
 // Menu background colors and separator cleanup
 :root {
 	--admin-top-nav-bg: #0a1f3f;
-	--admin-side-menu-bg: #102a4d;
+	--admin-side-menu-bg: #1a4674;
 }
 
 .top-nav,
@@ -124,3 +124,16 @@ select.dropdown {
 	padding: 0 !important;
 	margin: 0 !important;
 }
+
+// Align left menu with top nav and remove leading spacer item
+.main-menu {
+	top: 2.6em !important;
+}
+
+.main-menu > .ui.menu > .item:first-child:empty {
+	display: none !important;
+	height: 0 !important;
+	min-height: 0 !important;
+	padding: 0 !important;
+	margin: 0 !important;
+}