diff --git a/.github/diy/patches/vantage.patch b/.github/diy/patches/vantage.patch index 687b4e03e..87c987eb2 100644 --- a/.github/diy/patches/vantage.patch +++ b/.github/diy/patches/vantage.patch @@ -29,18 +29,9 @@ --- a/luci-app-vantage/htdocs/luci-static/resources/vantage/app.css +++ b/luci-app-vantage/htdocs/luci-static/resources/vantage/app.css -@@ -156,6 +156,8 @@ html[data-darkmode="true"] .vt-app { - position: static; z-index: auto; display: block; overflow: visible; - margin: 0; padding: 0; border: 0; border-radius: 0; - background: none; box-shadow: none; color: inherit; text-shadow: none; -+ width: 100%; -+ flex-direction: unset; - } - .vt-app :where(header, footer) :where(p, a, span) { line-height: inherit; text-shadow: none; } - .vt-app :where(header) :where(a) { color: inherit; } -@@ -477,6 +479,12 @@ html[data-darkmode="true"] .vt-app { +@@ -568,6 +568,12 @@ html[data-darkmode="true"] .vt-app { display: flex; align-items: center; gap: 14px; - margin: 2px 0 14px; + margin: 2px 0 var(--vt-sp-4); } +header::after { + height:0 !important; @@ -108,7 +99,7 @@ .cbi-section > p:last-child { margin-bottom: 0; } @@ -1982,7 +1988,25 @@ html:not([data-darkmode="true"]) .vt-login-page { } - /* the starfield (login.js), between the grid and the card */ + /* the backdrop (login.js: packets or starfield), between the grid and the card */ .vt-login-sky { position: fixed; inset: 0; width: 100%; height: 100%; pointer-events: none; } -.vt-login { position: relative; width: min(380px, 100%); } +.vt-login { @@ -157,17 +148,17 @@ --- a/luci-theme-vantage/ucode/template/themes/vantage/header.ut +++ b/luci-theme-vantage/ucode/template/themes/vantage/header.ut -@@ -12,6 +12,8 @@ - const authed = !!ctx.authsession; - const page_title = (authed && dispatched?.title) ? striptags(_(dispatched.title)) : 'LuCI'; +@@ -16,6 +16,8 @@ + const found = !!dispatched?.action?.type && dispatched.action.type != 'firstchild'; + const page_title = !authed ? null : !found ? _('Not found') : dispatched?.title ? striptags(_(dispatched.title)) : null; const lang = entityencode(dispatcher.lang ?? 'en', true); + const boardinfo = ubus.call("system", "board"); + const hostname = striptags(boardinfo?.hostname ?? '?'); -%} -@@ -22,8 +24,8 @@ - {{ entityencode(page_title, true) }} · LuCI +@@ -26,8 +28,8 @@ + {{ page_title ? entityencode(page_title, true) + ' · ' : '' }}LuCI