From 2a811183c4d4d1f157e9fcb5889b61c555c9299a Mon Sep 17 00:00:00 2001 From: robin Date: Sun, 15 Feb 2026 14:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EdgeAdmin/web/views/@default/@layout.html | 4 +- .../web/views/@default/@layout_override.css | 44 +- .../web/views/@default/@layout_override.less | 48 +- EdgeAdmin/web/views/@default/index/index.css | 21 +- EdgeAdmin/web/views/@default/index/index.less | 22 +- EdgeUser/web/views/@default/@layout.html | 12 +- .../web/views/@default/@layout_override.css | 47 +- .../web/views/@default/@layout_override.less | 52 +- EdgeUser/web/views/@default/index/index.css | 278 ++- EdgeUser/web/views/@default/index/index.html | 120 +- EdgeUser/web/views/@default/index/index.js | 70 +- EdgeUser/web/views/@default/index/index.less | 293 ++- EdgeUser/web/views/@default/login/index.css | 279 ++- EdgeUser/web/views/@default/login/index.html | 129 +- EdgeUser/web/views/@default/login/index.js | 73 +- EdgeUser/web/views/@default/login/index.less | 293 ++- config.xml | 1984 ----------------- deploy.sh => deploy/deploy.sh | 0 deploy/升级部署手册.md | 141 ++ 19 files changed, 1612 insertions(+), 2298 deletions(-) delete mode 100644 config.xml rename deploy.sh => deploy/deploy.sh (100%) create mode 100644 deploy/升级部署手册.md diff --git a/EdgeAdmin/web/views/@default/@layout.html b/EdgeAdmin/web/views/@default/@layout.html index d643d3a..708bdc6 100644 --- a/EdgeAdmin/web/views/@default/@layout.html +++ b/EdgeAdmin/web/views/@default/@layout.html @@ -86,7 +86,7 @@ - + @@ -154,4 +154,4 @@ {$echo "footer"} - \ No newline at end of file + diff --git a/EdgeAdmin/web/views/@default/@layout_override.css b/EdgeAdmin/web/views/@default/@layout_override.css index 9e33757..3fb1b56 100644 --- a/EdgeAdmin/web/views/@default/@layout_override.css +++ b/EdgeAdmin/web/views/@default/@layout_override.css @@ -1,9 +1,9 @@ /* 全局字体大小调整 - 增加 10% */ html { - font-size: 15.4px !important; /* 14px * 1.1 = 15.4px */ + font-size: 16px !important; } body { - font-size: 15.4px !important; /* 14px * 1.1 = 15.4px */ + font-size: 16px !important; } .ui.toggle.checkbox input:focus:checked ~ .box:before, .ui.toggle.checkbox input:focus:checked ~ label:before { @@ -77,4 +77,42 @@ body.swal2-shown { background: rgba(230, 230, 230, 0.35) !important; border-radius: 3px; } -/*# sourceMappingURL=@layout_override.css.map */ \ No newline at end of file +:root { + --admin-top-nav-bg: #0a1f3f; + --admin-side-menu-bg: #102a4d; +} +.top-nav.theme1, +.top-nav.theme2, +.top-nav.theme3, +.top-nav.theme4, +.top-nav.theme5, +.top-nav.theme6, +.top-nav.theme7 { + background: var(--admin-top-nav-bg) !important; +} +.main-menu.theme1, +.main-menu.theme2, +.main-menu.theme3, +.main-menu.theme4, +.main-menu.theme5, +.main-menu.theme6, +.main-menu.theme7, +.main-menu.theme1 .menu, +.main-menu.theme2 .menu, +.main-menu.theme3 .menu, +.main-menu.theme4 .menu, +.main-menu.theme5 .menu, +.main-menu.theme6 .menu, +.main-menu.theme7 .menu { + background: var(--admin-side-menu-bg) !important; +} +.main-menu .ui.menu .item.separator, +.main-menu .ui.menu .sub-items .item.separator { + display: none !important; + border: 0 !important; + height: 0 !important; + min-height: 0 !important; + padding: 0 !important; + margin: 0 !important; +} +/*# sourceMappingURL=@layout_override.css.map */ diff --git a/EdgeAdmin/web/views/@default/@layout_override.less b/EdgeAdmin/web/views/@default/@layout_override.less index ab0cf55..a831635 100644 --- a/EdgeAdmin/web/views/@default/@layout_override.less +++ b/EdgeAdmin/web/views/@default/@layout_override.less @@ -1,10 +1,10 @@ // 全局字体大小调整 - 增加 10% html { - font-size: 15.4px !important; // 14px * 1.1 = 15.4px + font-size: 16px !important; } body { - font-size: 15.4px !important; // 14px * 1.1 = 15.4px + font-size: 16px !important; } // labels @@ -106,3 +106,47 @@ body.swal2-shown { min-width: 5em; } } + +// Menu background colors only +:root { + --admin-top-nav-bg: #0a1f3f; + --admin-side-menu-bg: #102a4d; +} + +.top-nav.theme1, +.top-nav.theme2, +.top-nav.theme3, +.top-nav.theme4, +.top-nav.theme5, +.top-nav.theme6, +.top-nav.theme7 { + background: var(--admin-top-nav-bg) !important; +} + +.main-menu.theme1, +.main-menu.theme2, +.main-menu.theme3, +.main-menu.theme4, +.main-menu.theme5, +.main-menu.theme6, +.main-menu.theme7, +.main-menu.theme1 .menu, +.main-menu.theme2 .menu, +.main-menu.theme3 .menu, +.main-menu.theme4 .menu, +.main-menu.theme5 .menu, +.main-menu.theme6 .menu, +.main-menu.theme7 .menu { + background: var(--admin-side-menu-bg) !important; +} + +// Hide menu separators +.main-menu .ui.menu .item.separator, +.main-menu .ui.menu .sub-items .item.separator { + display: none !important; + border: 0 !important; + height: 0 !important; + min-height: 0 !important; + padding: 0 !important; + margin: 0 !important; +} diff --git a/EdgeAdmin/web/views/@default/index/index.css b/EdgeAdmin/web/views/@default/index/index.css index 190ac7b..1f86819 100644 --- a/EdgeAdmin/web/views/@default/index/index.css +++ b/EdgeAdmin/web/views/@default/index/index.css @@ -25,7 +25,8 @@ body.login-page { body.login-page > div { position: relative; width: 100%; - height: 100%; + height: 100vh; + min-height: 100vh; } .bg-layer { @@ -241,4 +242,22 @@ body.login-page > div { padding: 30px 18px; } } +/* SweetAlert2 fallback on login page */ +body.login-page.swal2-height-auto { + height: 100% !important; +} + +body.login-page .swal2-container { + position: fixed !important; + inset: 0 !important; + z-index: 20000 !important; + display: flex !important; + align-items: center !important; + justify-content: center !important; + padding: 0.625em !important; +} + +body.login-page .swal2-container.swal2-backdrop-show { + background: rgba(0, 0, 0, 0.42) !important; +} /*# sourceMappingURL=index.css.map */ diff --git a/EdgeAdmin/web/views/@default/index/index.less b/EdgeAdmin/web/views/@default/index/index.less index 971e424..dc6922e 100644 --- a/EdgeAdmin/web/views/@default/index/index.less +++ b/EdgeAdmin/web/views/@default/index/index.less @@ -25,7 +25,8 @@ body.login-page { body.login-page > div { position: relative; width: 100%; - height: 100%; + height: 100vh; + min-height: 100vh; } .bg-layer { @@ -241,3 +242,22 @@ body.login-page > div { padding: 30px 18px; } } + +/* SweetAlert2 fallback on login page */ +body.login-page.swal2-height-auto { + height: 100% !important; +} + +body.login-page .swal2-container { + position: fixed !important; + inset: 0 !important; + z-index: 20000 !important; + display: flex !important; + align-items: center !important; + justify-content: center !important; + padding: 0.625em !important; +} + +body.login-page .swal2-container.swal2-backdrop-show { + background: rgba(0, 0, 0, 0.42) !important; +} diff --git a/EdgeUser/web/views/@default/@layout.html b/EdgeUser/web/views/@default/@layout.html index 01eadcc..b66981f 100644 --- a/EdgeUser/web/views/@default/@layout.html +++ b/EdgeUser/web/views/@default/@layout.html @@ -32,9 +32,9 @@ {$if not (eq .teaThemeBackgroundColor "")} @@ -43,7 +43,7 @@