diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 0a6580b2..8d9ab08f 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.8.19 -PKG_RELEASE:=231 +PKG_RELEASE:=232 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm b/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm index 461b58df..adaea6a6 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm @@ -14,7 +14,7 @@ box-shadow: 0 0 2rem 0 rgba(136, 152, 170, .3); color: #525f7f; background: #fff; - z-index: 5; + z-index: 999; box-sizing: border-box; } @@ -75,13 +75,10 @@ display:block !important; const _ASSETS = '/luci-static/passwall/'; const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[passwall]], [[ip]])%>'; -let wW = window.innerWidth; +let statusBar = document.querySelector(".status-bar"); function resize() { - wW = window.innerWidth; - let lw = document.querySelector(".main-left")?.offsetWidth ?? 5; - let statusBar = document.querySelector(".status-bar"); - statusBar.style.width = (wW - lw) + 'px'; + statusBar.style.width = document.getElementById("maincontent").offsetWidth + 'px'; let flagElement = statusBar.querySelector(".flag"); flagElement.style.width = (flagElement.offsetHeight / 3 * 4) + 'px'; @@ -125,4 +122,5 @@ document.addEventListener('DOMContentLoaded', function() { }); window.addEventListener('resize', resize); +document.body.appendChild(statusBar);