diff --git a/luci-theme-argon/Makefile b/luci-theme-argon/Makefile index c632730d1..42ddd9ce3 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:=8 +PKG_RELEASE:=9 CONFIG_LUCI_CSSTIDY:= diff --git a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css index 451a79a02..4cc7e2256 100644 --- a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css +++ b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css @@ -103,6 +103,21 @@ 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: .3; +} +.main .main-right{background-color: transparent !important} main { display: block; } @@ -718,7 +733,7 @@ select[multiple="multiple"] { } .login-page .login-container { z-index: 10; - margin-left: 5%; + margin: 0 auto; display: flex; height: 100vh; width: 26rem; diff --git a/luci-theme-argon/less/layout.less b/luci-theme-argon/less/layout.less index 53dd7bf16..f74b3781a 100644 --- a/luci-theme-argon/less/layout.less +++ b/luci-theme-argon/less/layout.less @@ -7,20 +7,6 @@ // 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; @@ -29,9 +15,6 @@ body::before { 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 c38a7803a..b4e5a590f 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: 0 auto; + margin-left: 5%; display: flex; height: 100vh; width: 26rem;