luci-theme-argonv3: sync with upstream source
CN_SZTL
@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=Argon Theme
|
||||
LUCI_DEPENDS:=
|
||||
PKG_VERSION:=1.1
|
||||
PKG_RELEASE:=01-20190809
|
||||
PKG_VERSION:=1.3
|
||||
PKG_RELEASE:=01-20191111
|
||||
|
||||
include $(TOPDIR)/feeds/luci/luci.mk
|
||||
|
||||
|
||||
@ -2912,7 +2912,7 @@ header > .container > .pull-right > * {
|
||||
border-radius: 60px;
|
||||
border: #fff 3px solid;
|
||||
|
||||
background-image:url(../img/head-icon.png);
|
||||
background-image:url(../head-icon.jpg);
|
||||
background-size:cover;
|
||||
box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(156, 39, 176, 0.4);
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 573 KiB After Width: | Height: | Size: 275 KiB |
|
Before Width: | Height: | Size: 795 KiB After Width: | Height: | Size: 388 KiB |
|
Before Width: | Height: | Size: 373 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 410 KiB After Width: | Height: | Size: 156 KiB |
|
Before Width: | Height: | Size: 158 KiB |
|
Before Width: | Height: | Size: 16 KiB |
@ -1,5 +1,5 @@
|
||||
<%#
|
||||
Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
|
||||
Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template
|
||||
|
||||
luci-theme-argon
|
||||
Copyright 2019 Jerrykuku <jerrykuku@qq.com>
|
||||
@ -14,19 +14,10 @@
|
||||
|
||||
MUI:
|
||||
https://github.com/muicss/mui
|
||||
|
||||
luci-theme-material:
|
||||
https://github.com/LuttyYang/luci-theme-material/
|
||||
|
||||
Agron Theme
|
||||
https://demos.creative-tim.com/argon-dashboard/index.html
|
||||
|
||||
Login background
|
||||
https://unsplash.com/
|
||||
|
||||
Font generate by Icomoon
|
||||
https://icomoon.io/
|
||||
|
||||
Licensed to the public under the Apache License 2.0
|
||||
-%>
|
||||
|
||||
@ -35,6 +26,8 @@
|
||||
local util = require "luci.util"
|
||||
local http = require "luci.http"
|
||||
local disp = require "luci.dispatcher"
|
||||
local fs = require "nixio.fs"
|
||||
local nutil = require "nixio.util"
|
||||
|
||||
local boardinfo = util.ubus("system", "board")
|
||||
|
||||
@ -54,6 +47,15 @@
|
||||
local c = tree
|
||||
local i, r
|
||||
|
||||
function glob(...)
|
||||
local iter, code, msg = fs.glob(...)
|
||||
if iter then
|
||||
return nutil.consume(iter)
|
||||
else
|
||||
return nil, code, msg
|
||||
end
|
||||
end
|
||||
|
||||
-- tag all nodes leading to this page
|
||||
for i, r in ipairs(request) do
|
||||
if c.nodes and c.nodes[r] then
|
||||
@ -189,6 +191,13 @@
|
||||
end
|
||||
|
||||
math.randomseed(os.time())
|
||||
|
||||
local bgcount = 0
|
||||
for f in ipairs(glob("/www/luci-static/argon/img/*")) do
|
||||
bgcount = bgcount + 1
|
||||
end
|
||||
|
||||
|
||||
-%>
|
||||
<!DOCTYPE html>
|
||||
<html lang="<%=luci.i18n.context.lang%>">
|
||||
@ -212,7 +221,6 @@
|
||||
<meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
|
||||
<link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
|
||||
<link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
|
||||
<link rel="apple-touch-startup-image" href="<%=media%>/launch.png">
|
||||
<link rel="stylesheet" href="<%=media%>/css/purecss.css">
|
||||
<link rel="stylesheet" href="<%=media%>/css/style.css?v=<%=math.random(1,100000)%>">
|
||||
<link rel="shortcut icon" href="<%=media%>/favicon.ico">
|
||||
@ -270,7 +278,7 @@
|
||||
</div>
|
||||
</header>
|
||||
<div class="darkMask"></div>
|
||||
<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,4)%>.jpg)"></div>
|
||||
<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,bgcount)%>.jpg)"></div>
|
||||
<div id="maincontent">
|
||||
<div class="container">
|
||||
<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
|
||||
|
||||