diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 17a5eb11..ab266081 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:=237 +PKG_RELEASE:=238 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 a311e229..411b38ba 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/status_bottom.htm @@ -76,11 +76,11 @@ const _ASSETS = '/luci-static/passwall/'; const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[passwall]], [[ip]])%>'; let mainContent = document.getElementById("maincontent"); +let statusBar = document.querySelector(".status-bar"); function resize() { wW = window.innerWidth; - let lw = document.querySelector(".main-left, .fs-sidebar")?.offsetWidth ?? 5; - let statusBar = document.querySelector(".status-bar"); + let lw = document.querySelector(".main-left, :root[data-layout='sidebar'] .fs-sidebar")?.offsetWidth ?? 5; statusBar.style.width = (wW - lw) + 'px'; let flagElement = statusBar.querySelector(".flag"); flagElement.style.width = (flagElement.offsetHeight / 3 * 4) + 'px'; diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 227bfc4a..e031cfd7 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.20 -PKG_RELEASE:=97 +PKG_RELEASE:=98 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 504ab578..33fa8572 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm @@ -79,11 +79,11 @@ const _ASSETS = '/luci-static/passwall2/'; const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[passwall2]], [[ip]])%>'; let mainContent = document.getElementById("maincontent"); +let statusBar = document.querySelector(".status-bar"); function resize() { wW = window.innerWidth; - let lw = document.querySelector(".main-left, .fs-sidebar")?.offsetWidth ?? 5; - let statusBar = document.querySelector(".status-bar"); + let lw = document.querySelector(".main-left, :root[data-layout='sidebar'] .fs-sidebar")?.offsetWidth ?? 5; statusBar.style.width = (wW - lw) + 'px'; let flagElement = statusBar.querySelector(".flag"); flagElement.style.width = (flagElement.offsetHeight / 3 * 4) + 'px'; diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 365bdc31..82506d52 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:=64 +PKG_RELEASE:=65 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 e595f529..5f1622d7 100644 --- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/status_bottom.htm +++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/status_bottom.htm @@ -79,11 +79,11 @@ const _ASSETS = '/luci-static/shadowsocksr/'; const CHECK_IP_URL = '<%=url([[admin]], [[services]], [[shadowsocksr]], [[ip]])%>'; let mainContent = document.getElementById("maincontent"); +let statusBar = document.querySelector(".status-bar"); function resize() { wW = window.innerWidth; - let lw = document.querySelector(".main-left, .fs-sidebar")?.offsetWidth ?? 5; - let statusBar = document.querySelector(".status-bar"); + let lw = document.querySelector(".main-left, :root[data-layout='sidebar'] .fs-sidebar")?.offsetWidth ?? 5; statusBar.style.width = (wW - lw) + 'px'; let flagElement = statusBar.querySelector(".flag"); flagElement.style.width = (flagElement.offsetHeight / 3 * 4) + 'px';