diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index adeb3c420..1da637d4b 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=26.8.17 -PKG_RELEASE:=92 +PKG_RELEASE:=93 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm b/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm index 9532cae50..92293398a 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/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; } @@ -78,13 +78,10 @@ const _ASSETS = '/luci-static/passwall2/'; const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[passwall2]], [[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'; @@ -128,4 +125,5 @@ document.addEventListener('DOMContentLoaded', function() { }); window.addEventListener('resize', resize); +document.body.appendChild(statusBar); diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 23a8463b3..83b8c4ead 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=196 -PKG_RELEASE:=60 +PKG_RELEASE:=61 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/luasrc/view/shadowsocksr/status_bottom.htm b/luci-app-ssr-plus/luasrc/view/shadowsocksr/status_bottom.htm index 9730853a6..2d62e4185 100644 --- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/status_bottom.htm +++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/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; } @@ -78,13 +78,10 @@ const _ASSETS = '/luci-static/shadowsocksr/'; const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[shadowsocksr]], [[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'; @@ -128,4 +125,5 @@ document.addEventListener('DOMContentLoaded', function() { }); window.addEventListener('resize', resize); +document.body.appendChild(statusBar);