diff --git a/luci-theme-material3/htdocs/luci-static/material3/cascade.css b/luci-theme-material3/htdocs/luci-static/material3/cascade.css index b4d7cf30..cfa1ed90 100644 --- a/luci-theme-material3/htdocs/luci-static/material3/cascade.css +++ b/luci-theme-material3/htdocs/luci-static/material3/cascade.css @@ -1955,7 +1955,7 @@ input[type="radio"]::before { } .cbi-radio:hover input[type="radio"]::before, -label:hover > input[type="radio"]::before, +label:hover>input[type="radio"]::before, input[type="radio"]:hover::before, input[type="radio"]:focus::before { box-shadow: 0 0 0 7px color-mix(in srgb, var(--text-color-high) 10%, transparent); @@ -2345,18 +2345,28 @@ body.sidebar-open header { .sidebar { position: fixed; - height: auto; + height: calc(100vh - var(--material3-header-height)); + height: calc(100dvh - var(--material3-header-height)); float: none; margin-bottom: 0; transform: translateX(-100%); z-index: 900; border-radius: 0 1rem 1rem 0; + overflow: hidden; } .sidebar.active { transform: translateX(0); } + .sidebar>.nav { + height: 100%; + overflow-x: hidden; + overflow-y: auto; + overscroll-behavior: contain; + scrollbar-gutter: stable; + } + .sidebar-overlay { z-index: 800; } @@ -4851,4 +4861,4 @@ body[data-page^="admin-services-dockerman"] #view a[href*="/dockerman/"] strong[ body[data-page^="admin-services-dockerman"] #view a[href*="/dockerman/"] strong[style*="color: #28a745"] { color: var(--success-color-high) !important; -} +} \ No newline at end of file diff --git a/ookla-speedtest/Makefile b/ookla-speedtest/Makefile index 364e3f7c..8705c515 100644 --- a/ookla-speedtest/Makefile +++ b/ookla-speedtest/Makefile @@ -1,65 +1,41 @@ -# -# Copyright (C) 2024 sbwml -# Copyright (c) 2025-2026 sirpdboy -# -# This is free software, licensed under the GPL-3.0 License. -# - include $(TOPDIR)/rules.mk PKG_NAME:=ookla-speedtest PKG_VERSION:=1.2.0 -PKG_RELEASE:=7 +PKG_RELEASE:=8 +PKG_MAINTAINER:=Konstantine Shevlakov -ifeq ($(ARCH),aarch64) - PKG_ARCH_SUFFIX:=aarch64 - PKG_HASH:=skip -else ifeq ($(ARCH),arm) - ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) - ifeq ($(ARM_CPU_FEATURES),) - PKG_ARCH_SUFFIX:=armel - PKG_HASH:=skip - else - PKG_ARCH_SUFFIX:=armhf - PKG_HASH:=skip - endif -else ifeq ($(ARCH),i386) - PKG_ARCH_SUFFIX:=i386 - PKG_HASH:=skip -else ifeq ($(ARCH),x86_64) - PKG_ARCH_SUFFIX:=x86_64 - PKG_HASH:=skip -endif - -PKG_SOURCE:=ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz -PKG_SOURCE_URL:=https://install.speedtest.net/app/cli -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_ARCH_SUFFIX) - -PKG_MAINTAINER:=sbwml include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - SUBMENU:=Speed Test - TITLE:=Speedtest CLI by Ookla - URL:=https://www.speedtest.net/ - DEPENDS:=@(aarch64||arm||i386||x86_64) +ca-certificates - URL:=https://www.speedtest.net/ + TITLE:=Speedtest from Ookla + SECTION:=net + CATEGORY:=Network endef +ifeq ($(ARCH),x86_64) + BIN_PATH:=./files/x86_64 +endif +ifeq ($(ARCH),i386) + BIN_PATH:=./files/i386 +endif +ifeq ($(ARCH),arm) + BIN_PATH:=./files/armhf +endif +ifeq ($(ARCH),aarch64) + BIN_PATH:=./files/aarch64 +endif + define Package/$(PKG_NAME)/description - Speedtest CLI by Ookla is the official command line client - for testing internet bandwidth using speedtest.net servers. + Speedtest CLI brings the trusted technology and global server network behind Speedtest to the command line. + Built for software developers, system administrators and computer enthusiasts alike, + Speedtest CLI is the first official Linux-native Speedtest application backed by Ookla®. endef - define Build/Prepare - ( \ - pushd $(PKG_BUILD_DIR) ; \ - $(TAR) -zxf $(DL_DIR)/ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz -C . ; \ - popd ; \ - ) +endef + +define Build/Configure endef define Build/Compile @@ -67,7 +43,9 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/speedtest $(1)/usr/bin/ookla-speedtest + $(CP) $(BIN_PATH)/speedtest $(1)/usr/bin endef -$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file +ifeq ($(ARCH),$(filter $(ARCH), x86_64 i386 arm aarch64)) + $(eval $(call BuildPackage,$(PKG_NAME))) +endif diff --git a/ookla-speedtest/files/aarch64/speedtest b/ookla-speedtest/files/aarch64/speedtest new file mode 100755 index 00000000..677c6e78 Binary files /dev/null and b/ookla-speedtest/files/aarch64/speedtest differ diff --git a/ookla-speedtest/files/armhf/speedtest b/ookla-speedtest/files/armhf/speedtest new file mode 100755 index 00000000..0b01c45b Binary files /dev/null and b/ookla-speedtest/files/armhf/speedtest differ diff --git a/ookla-speedtest/files/i386/speedtest b/ookla-speedtest/files/i386/speedtest new file mode 100755 index 00000000..6a6854e5 Binary files /dev/null and b/ookla-speedtest/files/i386/speedtest differ diff --git a/ookla-speedtest/files/x86_64/speedtest b/ookla-speedtest/files/x86_64/speedtest new file mode 100755 index 00000000..44c03da4 Binary files /dev/null and b/ookla-speedtest/files/x86_64/speedtest differ