--- a/luci-app-argon-config/root/etc/config/argon +++ b/luci-app-argon-config/root/etc/config/argon @@ -5,6 +5,6 @@ config global option blur_dark '10' option transparency '0.5' option transparency_dark '0.5' - option mode 'normal' - option online_wallpaper 'bing' + option mode 'dark' + option online_wallpaper 'default' --- 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')); --- a/luci-theme-argon/ucode/template/themes/argon/header_login.ut +++ b/luci-theme-argon/ucode/template/themes/argon/header_login.ut @@ -60,7 +60,7 @@ -%} - + {% include("themes/" + theme + "/head_meta", { hostname: hostname, node: node, bar_color: bar_color, media: media }) %} --- a/luci-theme-argon/ucode/template/themes/argon/header.ut +++ b/luci-theme-argon/ucode/template/themes/argon/header.ut @@ -47,7 +47,7 @@ -%} - + {% include("themes/" + theme + "/head_meta", { hostname: hostname, node: node, bar_color: bar_color, media: media }) %} --- a/luci-theme-argon/ucode/template/themes/argon/sysauth.ut +++ b/luci-theme-argon/ucode/template/themes/argon/sysauth.ut @@ -63,7 +63,7 @@ let mimeType = ""; if (fs.access("/etc/config/argon")) { - let online_wallpaper = cfg.get_first('argon', 'global', 'online_wallpaper') ?? (cfg.get_first('argon', 'global', 'bing_background') == '1' ? 'bing' : null); + online_wallpaper = cfg.get_first('argon', 'global', 'online_wallpaper') ?? (cfg.get_first('argon', 'global', 'bing_background') == '1' ? 'bing' : null); if (online_wallpaper && online_wallpaper != "none") { const picurl = ubus.call("luci.argon_wallpaper", "get_url") ?? {}; if (type(picurl?.url) == 'string' && match(picurl.url, /^https:\/\/[^[:space:]"'<>]+$/)) { @@ -93,7 +93,7 @@ %} -
+
{% if ( bgArry.backgroundType == "Video" ): %}
--- a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css +++ b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css @@ -124,6 +124,20 @@ body { -webkit-tap-highlight-color: transparent; font-size: 0.875rem; } +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: .4; +} main { display: block; } --- a/luci-theme-argon/ucode/template/themes/argon/footer.ut +++ b/luci-theme-argon/ucode/template/themes/argon/footer.ut @@ -19,13 +19,6 @@