diff --git a/README.md b/README.md index 84b67dfbb1..000c644e43 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Package Openwrt-BBR: [anshi233/Openwrt-BBR](https://github.com/anshi233/Openwrt- simple-obfs source: [aa65535/openwrt-simple-obfs](https://github.com/aa65535/openwrt-simple-obfs).
v2ray-plugin source: [honwen/openwrt-v2ray-plugin](https://github.com/honwen/openwrt-v2ray-plugin).
Package zxlhhyccc: [zxlhhyccc/MY-lede](https://github.com/zxlhhyccc/MY-lede).
-luci-theme-argonv3 source: [Meroser/luci-theme-argon](https://github.com/Meroser/luci-theme-argon).
+luci-theme-argonv3 source: [jerrykuku/luci-theme-argon](https://github.com/jerrykuku/luci-theme-argon).
luci-theme-darkmatter source: [apollo-ng/luci-theme-darkmatter](https://github.com/apollo-ng/luci-theme-darkmatter). # License diff --git a/package/cnsztl/luci-theme-argonv3/Makefile b/package/cnsztl/luci-theme-argonv3/Makefile index b95b3bcc36..5c6383b01d 100644 --- a/package/cnsztl/luci-theme-argonv3/Makefile +++ b/package/cnsztl/luci-theme-argonv3/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2014 The LuCI Team +# Copyright (C) 2008-2019 Jerrykuku # # This is free software, licensed under the Apache License, Version 2.0 . # @@ -8,7 +8,9 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= +PKG_VERSION:=1.1 +PKG_RELEASE:=01-20190809 include $(TOPDIR)/feeds/luci/luci.mk -# call BuildPackage - OpenWrt buildroot signature +# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/purecss.css b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/purecss.css index af89ba8690..0b2bf6426e 100644 --- a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/purecss.css +++ b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/purecss.css @@ -1 +1,7 @@ +/*! +Pure v1.0.1 +Copyright 2013 Yahoo! +Licensed under the BSD License. +https://github.com/pure-css/pure/blob/master/LICENSE.md +*/ .pure-g{letter-spacing:-.31em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-align-content:flex-start;-ms-flex-line-pack:start;align-content:flex-start}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){table .pure-g{display:block}}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u,.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{display:inline-block;zoom:1;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-g [class*=pure-u]{font-family:sans-serif}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%} \ No newline at end of file diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css index ab3f587315..c10fa81ab7 100644 --- a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css +++ b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/css/style.css @@ -1,5 +1,5 @@ /** - * Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template + * Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template * * luci-theme-argon * Copyright 2019 Jerrykuku @@ -14,8 +14,16 @@ * * 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 + * https://demos.creative-tim.com/argon-dashboard/index.html + * + * Login background + * https://unsplash.com/ + * * Licensed to the public under the Apache License 2.0 */ diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/favicon.ico b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/favicon.ico index 1caa15a92f..b407d18455 100644 Binary files a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/favicon.ico and b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/favicon.ico differ diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg index 0334870e28..00adf6378b 100644 Binary files a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg and b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg1.jpg differ diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg index 026498cf80..2fd939574e 100644 Binary files a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg and b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg2.jpg differ diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg index b9051b11e5..d32ddef24a 100644 Binary files a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg and b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg3.jpg differ diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg index 1abb79aa8a..c4f768455c 100644 Binary files a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg and b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/img/bg4.jpg differ diff --git a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js index 9386bf4f04..21403c89b9 100644 --- a/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js +++ b/package/cnsztl/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js @@ -1,5 +1,5 @@ /** - * Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template + * Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template * * luci-theme-argon * Copyright 2019 Jerrykuku @@ -14,8 +14,16 @@ * * 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 + * https://demos.creative-tim.com/argon-dashboard/index.html + * + * Login background + * https://unsplash.com/ + * * Licensed to the public under the Apache License 2.0 */ diff --git a/package/cnsztl/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm b/package/cnsztl/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm index cf6bbf132c..e63f26873d 100644 --- a/package/cnsztl/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm +++ b/package/cnsztl/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm @@ -1,5 +1,5 @@ <%# - Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argon Template + Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template luci-theme-argon Copyright 2019 Jerrykuku @@ -14,10 +14,19 @@ 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 -%> @@ -30,7 +39,8 @@ local categories = disp.node_childs(tree) %> -