From 78432d180153a86ddd307026e5162584ba89fadf Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sat, 4 Jan 2025 20:35:57 +0800 Subject: [PATCH] update 2025-01-04 20:35:57 --- .../po/zh_Hant/filebrowser.po | 8 +- .../htdocs/nekobox/assets/theme/cornsilk.css | 74 ++++++++++++++----- .../model/cbi/passwall/client/acl_config.lua | 5 +- .../acl/{footer.htm => view_chinadns_log.htm} | 8 +- 4 files changed, 65 insertions(+), 30 deletions(-) rename luci-app-passwall/luasrc/view/passwall/acl/{footer.htm => view_chinadns_log.htm} (81%) diff --git a/luci-app-filebrowser/po/zh_Hant/filebrowser.po b/luci-app-filebrowser/po/zh_Hant/filebrowser.po index bace0ddf7..62957dc8c 100644 --- a/luci-app-filebrowser/po/zh_Hant/filebrowser.po +++ b/luci-app-filebrowser/po/zh_Hant/filebrowser.po @@ -1,14 +1,14 @@ msgid "" msgstr "" -"PO-Revision-Date: 2024-11-18 14:09+0000\n" -"Last-Translator: 少年ウィンド \n" +"PO-Revision-Date: 2024-12-30 15:20+0000\n" +"Last-Translator: Anya Lin \n" "Language-Team: Chinese (Traditional Han script) \n" "Language: zh_Hant\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.9-dev\n" +"X-Generator: Weblate 5.10-dev\n" #: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/system/filebrowser.js:16 #: applications/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json:3 @@ -17,4 +17,4 @@ msgstr "檔案瀏覽器" #: applications/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json:3 msgid "Grant access to File Browser" -msgstr "" +msgstr "授予檔案瀏覽器存取權限" diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css index 5d1042d13..3907f0dc9 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/cornsilk.css @@ -14,7 +14,8 @@ --bs-info: #17a2b8; --bs-warning: #ffc107; --bs-danger: #dc3545; - + --bs-nav-pills-link-color: #004080; + --bs-nav-pills-link-hover-color: #28a745; --bs-heading-font-family: 'Montserrat', sans-serif; --bs-heading-font-weight: 700; --bs-heading-letter-spacing: 0.05em; @@ -43,13 +44,51 @@ h1, h2, h3, h4, h5, h6 { text-transform: uppercase; } -h1 { color: #3498db; } -h2 { color: #e74c3c; } -h3 { color: #6A4C93; } -h4 { color: #e74c3c !important; } -h5 { color: #9b59b6; } -h6 { color: #FF6B6B; } +h1 { color: #00a2e8; } +h2 { color: #00a2e8; } +h3 { color: #ffcc00; } +h4 { color: #ff4500 !important; } +h5 { color: ##7d5fff; } +h6 { color: #00ffff; } +.nav-pills .nav-link { + color: var(--bs-nav-pills-link-color); + font-weight: 600; + letter-spacing: 1px; +} + +.nav-pills .nav-link.active { + color: var(--bs-nav-pills-link-active-color); + background-color: #ffffff; +} + +.nav-pills .nav-link:hover { + color: var(--bs-nav-pills-link-hover-color); + background-color: #e6f2ff; +} + +#pluginLogTab { + color: #004080; +} + +#mihomoLogTab { + color: #800000; +} + +#singboxLogTab { + color: #006400; +} + + +.nav-pills .nav-link.active { + background-color: #0056b3; + color: #ffffff; +} + +.nav-pills .nav-link:hover { + background-color: #007bff; + color: #ffffff; +} .row .btn-lg { color: #00bfff !important; } @@ -100,18 +139,19 @@ h6 { color: #FF6B6B; } } .table thead th { - background: linear-gradient(45deg, #34495e, #2c3e50); - color: #ecf0f1; - border: none; - text-transform: uppercase; - letter-spacing: 1px; - font-weight: 600; - padding: 15px; - position: relative; + background-color: var(--bs-table-heading-bg); + color: var(--bs-table-heading-color); + font-weight: 700; + text-transform: uppercase; + letter-spacing: 1px; + padding: 15px; + border: none; + margin-bottom: 10px; } -.table tbody tr:nth-child(even) { - background-color: #f8f9fa; +.table thead th { + color: #ffffff !important; + background-color: #004080 !important; } .table td { diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua index c5ed6e209..b32f24099 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua @@ -290,6 +290,9 @@ o:depends({ _tcp_node_bool = "1" }) o:value("dnsmasq", "Dnsmasq") o:value("chinadns-ng", translate("ChinaDNS-NG (recommended)")) +o = s:option(DummyValue, "view_chinadns_log", " ") +o.template = appname .. "/acl/view_chinadns_log" + o = s:option(Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature.")) o.default = "0" o:depends({ _tcp_node_bool = "1" }) @@ -418,6 +421,4 @@ o:value("direct", translate("Direct DNS")) o.description = desc .. "" o:depends({dns_shunt = "dnsmasq", tcp_proxy_mode = "proxy", chn_list = "direct"}) -m:append(Template(appname .. "/acl/footer")) - return m diff --git a/luci-app-passwall/luasrc/view/passwall/acl/footer.htm b/luci-app-passwall/luasrc/view/passwall/acl/view_chinadns_log.htm similarity index 81% rename from luci-app-passwall/luasrc/view/passwall/acl/footer.htm rename to luci-app-passwall/luasrc/view/passwall/acl/view_chinadns_log.htm index 6026e6dc9..7c9933a08 100644 --- a/luci-app-passwall/luasrc/view/passwall/acl/footer.htm +++ b/luci-app-passwall/luasrc/view/passwall/acl/view_chinadns_log.htm @@ -5,12 +5,6 @@ local api = require "luci.passwall.api" //' + "?flag=" + sid + "', '_blank')"); + logLink.setAttribute("onclick", "window.open('" + '<%=api.url("get_chinadns_log") .. "?flag=" .. section%>' + "', '_blank')"); select.insertAdjacentElement("afterend", logLink); } }, 1000);