From 7498951b9f2205e95fc7127088d03e8a89452827 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 29 Aug 2026 05:43:50 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9B=84=20Sync=202026-08-29=2005:43:50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-argon-config/Makefile | 2 +- .../luci-static/resources/view/argon-config.js | 3 ++- luci-app-argon-config/root/etc/config/argon | 2 +- luci-theme-argon/Makefile | 2 +- luci-theme-argon/less/layout.less | 17 +++++++++++++++++ luci-theme-argon/less/sysauth.less | 2 +- .../ucode/template/themes/argon/footer_login.ut | 2 -- .../ucode/template/themes/argon/sysauth.ut | 2 +- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/luci-app-argon-config/Makefile b/luci-app-argon-config/Makefile index 1d84e7488..5ec6d369f 100644 --- a/luci-app-argon-config/Makefile +++ b/luci-app-argon-config/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-argon-config PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=jerrykuku diff --git a/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js b/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js index e5c2d2016..6dd4a28f1 100644 --- a/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js +++ b/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js @@ -50,11 +50,12 @@ return view.extend({ s.anonymous = true; o = s.option(form.ListValue, 'online_wallpaper', _('Wallpaper source')); + o.value('default', _('Default')); o.value('none', _('Built-in')); o.value('bing', _('Bing')); o.value('unsplash', _('Unsplash')); o.value('wallhaven', _('Wallhaven')); - o.default = 'bing'; + o.default = 'default'; o.rmempty = false; o = s.option(form.ListValue, 'mode', _('Theme mode')); diff --git a/luci-app-argon-config/root/etc/config/argon b/luci-app-argon-config/root/etc/config/argon index df27a54c4..a6bdfb87d 100644 --- a/luci-app-argon-config/root/etc/config/argon +++ b/luci-app-argon-config/root/etc/config/argon @@ -6,5 +6,5 @@ config global option transparency '0.5' option transparency_dark '0.5' option mode 'dark' - option online_wallpaper 'bing' + option online_wallpaper 'default' diff --git a/luci-theme-argon/Makefile b/luci-theme-argon/Makefile index 55f0b39df..9d2b1ffa9 100644 --- a/luci-theme-argon/Makefile +++ b/luci-theme-argon/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:=+USE_APK:wget-any +!USE_APK:wget +jsonfilter PKG_VERSION:=2.4.7 -PKG_RELEASE:=5 +PKG_RELEASE:=6 CONFIG_LUCI_CSSTIDY:= diff --git a/luci-theme-argon/less/layout.less b/luci-theme-argon/less/layout.less index f74b3781a..53dd7bf16 100644 --- a/luci-theme-argon/less/layout.less +++ b/luci-theme-argon/less/layout.less @@ -7,6 +7,20 @@ // 1. Main Container Layout // ========================================================================== +body::before { + content: ""; + background-image: url("/luci-static/argon/img/pattern.svg"); + background-repeat: repeat; + background-size: 440px auto; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: -1; + pointer-events: none; + opacity: .3; +} .main { position: relative; @@ -15,6 +29,9 @@ overflow-y: auto; display: flex; flex-direction: row; + .main-right { + background-color: transparent !important; + } } // 2. Left Sidebar Layout diff --git a/luci-theme-argon/less/sysauth.less b/luci-theme-argon/less/sysauth.less index b4e5a590f..c38a7803a 100644 --- a/luci-theme-argon/less/sysauth.less +++ b/luci-theme-argon/less/sysauth.less @@ -75,7 +75,7 @@ // Login container .login-container { z-index: 10; - margin-left: 5%; + margin: 0 auto; display: flex; height: 100vh; width: 26rem; diff --git a/luci-theme-argon/ucode/template/themes/argon/footer_login.ut b/luci-theme-argon/ucode/template/themes/argon/footer_login.ut index 8b1547a17..7dd5e14fe 100644 --- a/luci-theme-argon/ucode/template/themes/argon/footer_login.ut +++ b/luci-theme-argon/ucode/template/themes/argon/footer_login.ut @@ -20,8 +20,6 @@ diff --git a/luci-theme-argon/ucode/template/themes/argon/sysauth.ut b/luci-theme-argon/ucode/template/themes/argon/sysauth.ut index 70178c28f..452ddb130 100644 --- a/luci-theme-argon/ucode/template/themes/argon/sysauth.ut +++ b/luci-theme-argon/ucode/template/themes/argon/sysauth.ut @@ -115,7 +115,7 @@ {% else %} -
+
{% endif %}