zhao/luci-theme-argon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #166 from cartender/pr/whitespace_cleanup

Browse Source 
Clean up trailing whitespace, file headers, indentation and end of file newlines
This commit is contained in:
老竭力 2021-01-21 21:14:38 +08:00 committed by GitHub
commit dcc62fae29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/luci-static/argon/background/README.md
View File

@ -1,2 +1,2 @@
Drop background here!
accept jpg png gif and mp4
accept jpg png gif and mp4

2
htdocs/luci-static/argon/css/cascade.css
View File

@ -7,7 +7,7 @@
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-material:
* luci-theme-material:
* Copyright 2015 Lutty Yang <lutty@wcan.in>
* https://github.com/LuttyYang/luci-theme-material/
*

2
htdocs/luci-static/argon/css/dark.css
View File

@ -24,7 +24,7 @@
* Login background
* https://unsplash.com/
*
* Licensed to the public under the Apache License 2.0
* Licensed to the public under the Apache License 2.0
*/
body {
background: #1e1e1e;

4
htdocs/luci-static/argon/css/fonts.css
View File

@ -24,7 +24,7 @@
* Login background
* https://unsplash.com/
*
* Licensed to the public under the Apache License 2.0
* Licensed to the public under the Apache License 2.0
*/
@ -183,4 +183,4 @@
.icon-app:before {
content: "\e915";
}
}

2
htdocs/luci-static/argon/css/pure-min.css vendored
View File

File diff suppressed because one or more lines are too long

2
htdocs/luci-static/argon/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
htdocs/luci-static/argon/js/script.js
View File

@ -7,7 +7,7 @@
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-material:
* luci-theme-material:
* Copyright 2015 Lutty Yang <lutty@wcan.in>
* https://github.com/LuttyYang/luci-theme-material/
*

4
htdocs/luci-static/argon/less/cascade.less
View File

@ -8,7 +8,7 @@
* Have a bug? Please create an issue here on GitHub!
* https://github.com/jerrykuku/luci-theme-argon/issues
*
* luci-theme-material:
* luci-theme-material:
* Copyright 2015 Lutty Yang <lutty@wcan.in>
* https://github.com/LuttyYang/luci-theme-material/
*
@ -3814,7 +3814,7 @@ pre.command-output {
display: inline-block;
}
.main>.main-left>.nav>.slide>.slide-menu>li>a {
font-size: 0.8rem;

4
htdocs/luci-static/argon/less/dark.less
View File

@ -25,7 +25,7 @@
* Login background
* https://unsplash.com/
*
* Licensed to the public under the Apache License 2.0
* Licensed to the public under the Apache License 2.0
*/
body {
@ -825,4 +825,4 @@ input,
}
}
}

10
luasrc/view/themes/argon/footer.htm
View File

@ -7,13 +7,13 @@
Have a bug? Please create an issue here on GitHub!
https://github.com/jerrykuku/luci-theme-argon/issues
luci-theme-material:
luci-theme-material:
Copyright 2015 Lutty Yang <lutty@wcan.in>
Agron Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
Agron Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
-%>
<% local ver = require "luci.version" %>

10
luasrc/view/themes/argon/footer_login.htm
View File

@ -7,13 +7,13 @@
Have a bug? Please create an issue here on GitHub!
https://github.com/jerrykuku/luci-theme-argon/issues
luci-theme-material:
luci-theme-material:
Copyright 2015 Lutty Yang <lutty@wcan.in>
Agron Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
Agron Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
-%>
<% local ver = require "luci.version" %>

23
luasrc/view/themes/argon/header.htm
View File

@ -5,19 +5,19 @@
Copyright 2020 Jerrykuku <jerrykuku@qq.com>
Have a bug? Please create an issue here on GitHub!
https://github.com/jerrykuku/luci-theme-argon/issues
https://github.com/jerrykuku/luci-theme-argon/issues
luci-theme-material:
luci-theme-material:
Copyright 2015 Lutty Yang <lutty@wcan.in>
Agron Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Argon Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
-%>
<%
local sys = require "luci.sys"
local sys = require "luci.sys"
local util = require "luci.util"
local http = require "luci.http"
local disp = require "luci.dispatcher"
@ -25,15 +25,16 @@
local boardinfo = util.ubus("system", "board")
local node = disp.context.dispatched
local fs = require "nixio.fs"
local fs = require "nixio.fs"
local nutil = require "nixio.util"
local uci = require 'luci.model.uci'.cursor()
-- send as HTML5
http.prepare_content("text/html")
math.randomseed(os.time())
-- Custom settings
local mode = 'normal'
local dark_css = fs.readfile('/www/luci-static/argon/css/dark.css')
@ -54,7 +55,7 @@
<html lang="<%=luci.i18n.context.lang%>">
<head>
<meta charset="utf-8">
<meta charset="utf-8">
<title>
<%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %>
- LuCI</title>

38
luasrc/view/themes/argon/header_login.htm
View File

@ -1,39 +1,41 @@
<%#
edge is a clean HTML5 theme for LuCI. It is based on luci-theme-material edge Template
Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material Argon Template
luci-theme-edge
luci-theme-argon
Copyright 2020 Jerrykuku <jerrykuku@qq.com>
Have a bug? Please create an issue here on GitHub!
https://github.com/jerrykuku/luci-theme-edge/issues
https://github.com/jerrykuku/luci-theme-argon/issues
luci-theme-material:
luci-theme-material:
Copyright 2015 Lutty Yang <lutty@wcan.in>
Agron Theme
https://demos.creative-tim.com/edge-dashboard/index.html
Argon Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
-%>
<%
local sys = require "luci.sys"
local sys = require "luci.sys"
local util = require "luci.util"
local http = require "luci.http"
local disp = require "luci.dispatcher"
local boardinfo = util.ubus("system", "board")
local node = disp.context.dispatched
local fs = require "nixio.fs"
local nutil = require "nixio.util"
local uci = require 'luci.model.uci'.cursor()
local fs = require "nixio.fs"
local nutil = require "nixio.util"
local uci = require 'luci.model.uci'.cursor()
-- send as HTML5
http.prepare_content("text/html")
math.randomseed(tonumber(tostring(os.time()):reverse():sub(1, 9)))
-- Custom settings
math.randomseed(tonumber(tostring(os.time()):reverse():sub(1, 9)))
-- Custom settings
local mode = 'normal'
local dark_css = fs.readfile('/www/luci-static/argon/css/dark.css')
local bar_color = '#5e72e4'
@ -47,8 +49,7 @@
blur_opacity_dark = uci:get_first('argon', 'global', 'transparency_dark')
mode = uci:get_first('argon', 'global', 'mode')
bar_color = mode == 'dark' and dark_primary or primary
end
end
-%>
<!DOCTYPE html>
<html lang="<%=luci.i18n.context.lang%>">
@ -114,10 +115,9 @@
<script src="<%=resource%>/cbi.js<%# ?v=PKG_VERSION %>"></script>
<script src="<%=resource%>/xhr.js<%# ?v=PKG_VERSION %>"></script>
<script src="<%=media%>/js/jquery.min.js<%# ?v=PKG_VERSION %>"></script>
</head>
<body
class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>"
data-page="<%= table.concat(disp.context.requestpath, "-") %>">

16
luasrc/view/themes/argon/sysauth.htm
View File

@ -14,8 +14,8 @@
MUI:
https://github.com/muicss/mui
Agron Theme
Argon Theme
https://demos.creative-tim.com/argon-dashboard/index.html
Licensed to the public under the Apache License 2.0
@ -25,7 +25,7 @@
<%
local util = require "luci.util"
local boardinfo = util.ubus("system", "board")
local fs = require "nixio.fs"
local fs = require "nixio.fs"
local nutil = require "nixio.util"
function glob(...)
@ -60,7 +60,7 @@
end
if bgcount > 0 then
currentBg = bgs[math.random(1,bgcount)]
currentBg = bgs[math.random(1,bgcount)]
end
%>
<div class="login-page">
@ -83,9 +83,9 @@
})
</script>
<% else %>
<div class="main-bg" id="main-bg"
<div class="main-bg" id="main-bg"
<%
if (bgcount == 0 ) then
if (bgcount == 0) then
local http = require "luci.sys"
local json = require "luci.jsonc"
local bg_url = media .. "/img/bg1.jpg"
@ -96,11 +96,11 @@
end
%>
style="background-image:url(<%=bg_url%>)"
<% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then %>
<% elseif (bgcount > 0 and currentBg["type"] ~= "mp4") then %>
style="background-image:url(<%=currentBg.url%>)"
<% end %>
></div>
<% end %>
<div class="login-container">
<div class="login-form">