Bump version to 1.2

1. Minimal background file size.
2. Automatically detect the number of background images.
3. Delete unused image and file.
This commit is contained in:
jerrykuku 2019-11-09 09:08:47 +08:00
parent 4b0d9c9466
commit 782a7a4378
8 changed files with 12 additions and 14 deletions

View File

@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Argon Theme LUCI_TITLE:=Argon Theme
LUCI_DEPENDS:= LUCI_DEPENDS:=
PKG_VERSION:=1.1 PKG_VERSION:=1.2
PKG_RELEASE:=01-20190809 PKG_RELEASE:=01-20191109
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

Binary file not shown.

Before

Width:  |  Height:  |  Size: 573 KiB

After

Width:  |  Height:  |  Size: 275 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 KiB

After

Width:  |  Height:  |  Size: 388 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 410 KiB

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@ -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 luci-theme-argon
Copyright 2019 Jerrykuku <jerrykuku@qq.com> Copyright 2019 Jerrykuku <jerrykuku@qq.com>
@ -14,19 +14,10 @@
MUI: MUI:
https://github.com/muicss/mui https://github.com/muicss/mui
luci-theme-material:
https://github.com/LuttyYang/luci-theme-material/
Agron Theme Agron Theme
https://demos.creative-tim.com/argon-dashboard/index.html 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 Licensed to the public under the Apache License 2.0
-%> -%>
@ -35,6 +26,7 @@
local util = require "luci.util" local util = require "luci.util"
local http = require "luci.http" local http = require "luci.http"
local disp = require "luci.dispatcher" local disp = require "luci.dispatcher"
local fs = require "luci.fs"
local boardinfo = util.ubus("system", "board") local boardinfo = util.ubus("system", "board")
@ -189,6 +181,13 @@
end end
math.randomseed(os.time()) math.randomseed(os.time())
local bgcount = 0
for f in ipairs(fs.glob("/www/luci-static/argon/img/*")) do
bgcount = bgcount + 1
end
-%> -%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%=luci.i18n.context.lang%>"> <html lang="<%=luci.i18n.context.lang%>">
@ -212,7 +211,6 @@
<meta name="msapplication-TileImage" content="<%=media%>/logo.png"/> <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
<link rel="icon" href="<%=media%>/logo.png" sizes="144x144"> <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-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/purecss.css">
<link rel="stylesheet" href="<%=media%>/css/style.css?v=<%=math.random(1,100000)%>"> <link rel="stylesheet" href="<%=media%>/css/style.css?v=<%=math.random(1,100000)%>">
<link rel="shortcut icon" href="<%=media%>/favicon.ico"> <link rel="shortcut icon" href="<%=media%>/favicon.ico">
@ -270,7 +268,7 @@
</div> </div>
</header> </header>
<div class="darkMask"></div> <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 id="maincontent">
<div class="container"> <div class="container">
<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>