diff --git a/package/ctcgfw/luci-theme-argonv3/Makefile b/package/ctcgfw/luci-theme-argonv3/Makefile index 386a43a0de..a818ffc828 100644 --- a/package/ctcgfw/luci-theme-argonv3/Makefile +++ b/package/ctcgfw/luci-theme-argonv3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=1.6.4 -PKG_RELEASE:=20200727 +PKG_VERSION:=1.6.5 +PKG_RELEASE:=20200731 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css index a4ecaeb2f7..572af83c8b 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css @@ -127,6 +127,20 @@ li { background-size: cover; transition: all 0.5s; } +.login-page .video { + position: absolute; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + background-color: #000; + overflow: hidden; +} +.login-page .video video { + width: 100%; + height: auto; +} .login-page .login-container { height: 100%; margin-left: 4.5rem; @@ -558,7 +572,7 @@ footer a { } .main .main-left .nav li.slide .menu[data-title=VPN]:before { content: "\e90b"; - color: #5603ad; + color: #aaad03; } .main .main-left .nav li.slide .menu[data-title=Network]:before { content: "\e908"; @@ -2676,6 +2690,10 @@ input[name="nslookup"] { float: right; margin-top: 0rem !important; } + .login-page .video video { + width: auto !important; + height: 100% !important; + } .login-page .login-container { margin-left: 0rem !important; width: 100%; diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less index 08658bb50d..595bba4484 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less @@ -147,6 +147,21 @@ li { background-size: cover; transition: all 0.5s; + .video { + position: absolute; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + background-color: #000; + overflow: hidden; + video { + width: 100%; + height: auto; + } + } + .login-container { height: 100%; margin-left: 4.5rem; @@ -664,7 +679,7 @@ footer { .menu[data-title=VPN]:before { content: "\e90b"; - color: #5603ad; + color: #aaad03; } .menu[data-title=Network]:before { @@ -3370,6 +3385,12 @@ input[name="nslookup"] { float: right; margin-top: 0rem !important; } + .login-page .video { + video { + width: auto !important; + height: 100% !important; + } + } .login-page .login-container { margin-left: 0rem !important; diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm index a9b13c15e4..4cca01f5f8 100644 --- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm +++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm @@ -37,28 +37,12 @@ local category = request[1] local tree = disp.node() local categories = disp.node_childs(tree) - local ipkg = require "luci.model.ipkg" - - function split( str,reps ) - local resultStrList = {} - string.gsub(str,'[^'..reps..']+',function ( w ) - table.insert(resultStrList,w) - end) - return resultStrList - end - - local themepkg = ipkg.info("luci-theme-argon*") - local theme_info - for k,v in pairs(themepkg) do - theme_info = v - end - local theme_version = split(theme_info["Version"],"-") %>