From 630a18f6edc8b13f34fe378d49d1f2aec41c36ba Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Thu, 20 Feb 2025 12:23:23 +0800 Subject: [PATCH] update 2025-02-20 12:23:22 --- dockerd/Makefile | 4 +- luci-app-passwall/luasrc/passwall/com.lua | 3 +- .../htdocs/luci-static/kucat/css/style.css | 43 +++++++++++-------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dockerd/Makefile b/dockerd/Makefile index 68fc6b661..344ba9f97 100644 --- a/dockerd/Makefile +++ b/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=27.5.1 +PKG_VERSION:=28.0.0 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,7 +10,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=0d071c1773c855778d85590e01b924c1857000fd786485f4b674a3be2d3b893c +PKG_HASH:=89e26ecb0c13ef7037305811b0eb6dd4c70741c34ec3428d4396d68b03deb641 PKG_GIT_SHORT_COMMIT:=c710b88 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/luci-app-passwall/luasrc/passwall/com.lua b/luci-app-passwall/luasrc/passwall/com.lua index dffb2ac5f..68407ee80 100644 --- a/luci-app-passwall/luasrc/passwall/com.lua +++ b/luci-app-passwall/luasrc/passwall/com.lua @@ -76,7 +76,8 @@ _M["chinadns-ng"] = { armv5 = "wolfssl@arm.*v5te", armv6 = "wolfssl@arm.*v6t2", armv7 = "wolfssl@arm.*eabihf.*v7a", - armv8 = "wolfssl_noasm@aarch64.*v8a" + armv8 = "wolfssl_noasm@aarch64.*v8a", + riscv64 = "wolfssl@riscv64.*" } } diff --git a/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css b/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css index 77fe37c6b..9d1365111 100644 --- a/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css +++ b/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css @@ -504,6 +504,7 @@ small { } .main > .loading { position: fixed; + display: none; top: 0; opacity: 1; visibility: visible; @@ -525,11 +526,11 @@ small { .main .main-left .sidenav-header { text-align: center; height: 4.8rem; - margin: 0 10px; background-color: rgba(255, 255, 255, 0); padding: 2rem; + margin: 0rem 1rem 0rem 1rem; background-clip: padding-box; - border-bottom: 1px solid #ddd + border-bottom: 1px solid #ddd; } .main-right { width: calc(100% - 17rem); @@ -778,9 +779,6 @@ text-decoration: none!important; } /* menu */ -.main .main-left .nav { - margin-top: .5rem -} .slide-menu { overflow: hidden } @@ -790,7 +788,7 @@ text-decoration: none!important; font-size: var(--font-d); color: var(--menu-color); padding: .8rem 0rem .8rem 3rem; - margin-bottom: 0.1rem; + margin-bottom: 1px; font-weight: 500; display: flex; width: 100%; @@ -965,16 +963,13 @@ text-decoration: none!important; font-family: var(--font-sans); font-weight: bold; font-size: 1.5rem; - padding-left: 0px; - text-decoration: none; - /*letter-spacing: 3px;*/ - font-weight: bolder; - cursor: default; - vertical-align: text-bottom; - white-space: nowrap; - text-align: center; - align-items: center; - justify-content: center; + text-decoration: none; + letter-spacing: 3px; + font-weight: bolder; + cursor: default; + vertical-align: text-bottom; + white-space: nowrap; + text-align: center; } ul { @@ -1998,7 +1993,7 @@ select, input { max-width: 800px; min-height: 32px; margin: 5em auto; - padding: 1em; + padding: 0.2rem; border-radius: var(--radius2)!important; background-color: rgba(var(--primary-rgbbody), 1); box-shadow: 0 2px 10px 0px rgba(255, 255, 255, .16), 0 0 10px 0 rgba(255, 255, 255, .12); @@ -2943,6 +2938,20 @@ body.lang_pl.node-main-login .cbi-value-title { margin: 0; } +.cbi-tab-disabled[data-errors]::after { + content: attr(data-errors); + background: #c43c35; + color: #fff; + height: 16px; + min-width: 16px; + border-radius: 8px; + text-align: center; + margin: 0 5px 0 0; + padding: 2px 2px 2px 2px; + display: inline-flex; + flex-direction: column; + justify-content: center; +} #cbi-firewall-redirect table *, #cbi-network-switch_vlan table *, #cbi-firewall-zone table * { font-size: small; white-space: nowrap;