From 02822936f8f09c3fcc819530a2353dfa219f0bf5 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Sat, 25 Jul 2020 23:44:35 +0800 Subject: [PATCH] v2.2.1 --- Makefile | 2 +- README.md | 10 +++--- README_ZH.md | 7 ++-- htdocs/luci-static/argon/css/cascade.css | 32 +++++++++--------- htdocs/luci-static/argon/less/cascade.less | 39 +++++++++++----------- 5 files changed, 46 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index 617c9e9..125a319 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=2.2 +PKG_VERSION:=2.2.1 PKG_RELEASE:=20200725 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/README.md b/README.md index 8b2c415..64c1f1f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [4]: https://github.com/jerrykuku/luci-theme-argon/pulls [5]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg [6]: https://github.com/jerrykuku/luci-theme-argon/issues/new -[7]: https://img.shields.io/badge/release-v2.2-blue.svg? +[7]: https://img.shields.io/badge/release-v2.2.1-blue.svg? [8]: https://github.com/jerrykuku/luci-theme-argon/releases [9]: https://img.shields.io/github/downloads/jerrykuku/luci-theme-argon/total [10]: https://img.shields.io/badge/Contact-telegram-blue @@ -53,17 +53,17 @@ make -j1 V=s ## Install ### For Lean openwrt 18.06 LuCI ``` -wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.6.2/luci-theme-argon_1.6.2-20200725_all.ipk +wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.6.3/luci-theme-argon_1.6.3-20200725_all.ipk opkg install luci-theme-argon*.ipk ``` ### For openwrt official 19.07 Snapshots LuCI master ``` -wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2/luci-theme-argon_2.2-20200725_all.ipk +wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.1/luci-theme-argon_2.2.1-20200725_all.ipk opkg install luci-theme-argon*.ipk ``` -## Update log 2020.07.25 v2.2 +## Update log 2020.07.25 v2.2.1 - New login theme, Request background imge from bing.com, Auto change everyday. - New theme icon @@ -71,7 +71,7 @@ opkg install luci-theme-argon*.ipk - Fix font-size and padding margin - Restructure css file - Auto adapt to dark mode - +- Add blur effect for login form 【v2.2.1】 ## More Screenshots diff --git a/README_ZH.md b/README_ZH.md index ae53ea4..53ab5c2 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -50,17 +50,17 @@ make -j1 V=s ## 安装 ### For Lean openwrt ``` -wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.6.2/luci-theme-argon_1.6.2-20200725_all.ipk +wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.6.3/luci-theme-argon_1.6.3-20200725_all.ipk opkg install luci-theme-argon*.ipk ``` ### For openwrt official 19.07 Snapshots LuCI master ``` -wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2/luci-theme-argon_2.2-20200725_all.ipk +wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.1/luci-theme-argon_2.2.1-20200725_all.ipk opkg install luci-theme-argon*.ipk ``` -## 更新日志 2020.07.25 v2.2 +## 更新日志 2020.07.25 v2.2.1 - 全新的登录界面,图片背景跟随Bing.com，每天自动切换 - 全新的主题icon @@ -68,6 +68,7 @@ opkg install luci-theme-argon*.ipk - 细致的微调了 字号大小边距等等 - 重构了css文件 - 自动适应的暗黑模式 +- 登录背景添加毛玻璃效果 【v2.2.1】 ## 更多截图 diff --git a/htdocs/luci-static/argon/css/cascade.css b/htdocs/luci-static/argon/css/cascade.css index 0d25ab0..b3ea508 100644 --- a/htdocs/luci-static/argon/css/cascade.css +++ b/htdocs/luci-static/argon/css/cascade.css @@ -369,7 +369,7 @@ hr { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - color: #adb5bd; + color: #525461; font-size: 1.5rem; position: absolute; z-index: 100; @@ -394,10 +394,10 @@ hr { margin: 0.825rem 0; box-sizing: border-box; transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55); - color: #8898aa; + color: #525461; border: 0; border-radius: 0; - border-bottom: 1px solid #dee2e6; + border-bottom: 1px solid #fff; background-color: transparent; background-clip: padding-box; box-shadow: 0 3px 2px rgba(233, 236, 239, 0.05); @@ -456,6 +456,13 @@ hr { .login-page .login-container footer .luci-link { display: block; } +@supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { + .login-page .login-container .login-form { + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + background-color: rgba(244, 245, 247, 0.7); + } +} header, .main { width: 100%; @@ -3141,13 +3148,6 @@ pre.command-output { border-bottom: var(--white) 1px solid; border-radius: 0; } - @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { - .login-page .login-container .login-form { - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); - background-color: rgba(244, 245, 247, 0.7); - } - } } @media (prefers-color-scheme: dark) { body { @@ -3707,12 +3707,6 @@ pre.command-output { [data-page="admin-system-opkg"] h2 { color: #ccc !important; } -} -@media (prefers-color-scheme: dark) and (max-width: 480px) { - .node-status-iptables > .main div > .cbi-map > form { - background-color: #1e1e1e; - box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); - } @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { .login-page .login-container .login-form { -webkit-backdrop-filter: blur(10px); @@ -3721,3 +3715,9 @@ pre.command-output { } } } +@media (prefers-color-scheme: dark) and (max-width: 480px) { + .node-status-iptables > .main div > .cbi-map > form { + background-color: #1e1e1e; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); + } +} diff --git a/htdocs/luci-static/argon/less/cascade.less b/htdocs/luci-static/argon/less/cascade.less index 51da3bb..064bb6a 100644 --- a/htdocs/luci-static/argon/less/cascade.less +++ b/htdocs/luci-static/argon/less/cascade.less @@ -434,7 +434,7 @@ hr { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - color: #adb5bd; + color: #525461; font-size: 1.5rem; position: absolute; z-index: 100; @@ -461,10 +461,10 @@ hr { margin: 0.825rem 0; box-sizing: border-box; transition: all .3s cubic-bezier(.68, -.55, .265, 1.55); - color: #8898aa; + color: #525461; border: 0; border-radius: 0; - border-bottom: 1px solid #dee2e6; + border-bottom: 1px solid #fff; background-color: transparent; background-clip: padding-box; box-shadow: 0 3px 2px rgba(233, 236, 239, .05); @@ -539,7 +539,14 @@ hr { } +@supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { + .login-page .login-container .login-form { + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + background-color: rgba(244, 245, 247, 0.7); + } +} header, @@ -1428,7 +1435,6 @@ td>table>tbody>tr>td, -webkit-appearance: none !important; } -.cbi-button+.cbi-button {} .btn:hover, .btn:focus, @@ -3811,14 +3817,7 @@ pre.command-output { } - @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { - .login-page .login-container .login-form { - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); - background-color: rgba(244, 245, 247, 0.7); - - } - } + } @media (prefers-color-scheme: dark) { @@ -4553,13 +4552,6 @@ pre.command-output { color: #ccc !important; } -} - -@media (prefers-color-scheme: dark) and (max-width: 480px) { - .node-status-iptables>.main div>.cbi-map>form { - background-color: #1e1e1e; - box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); - } @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { .login-page .login-container .login-form { @@ -4569,4 +4561,13 @@ pre.command-output { } } +} + +@media (prefers-color-scheme: dark) and (max-width: 480px) { + .node-status-iptables>.main div>.cbi-map>form { + background-color: #1e1e1e; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); + } + + } \ No newline at end of file