From ea482634f16de83da172e9f71c2dd42bae96d06b Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Mon, 10 Feb 2025 00:21:15 +0800 Subject: [PATCH] update 2025-02-10 00:21:15 --- luci-app-fchomo/.prepare.sh | 11 +- luci-app-fchomo/Makefile | 2 +- luci-app-fchomo/docs/audio/A!.mp3 | Bin 0 -> 45184 bytes .../htdocs/luci-static/resources/fchomo.js | 8 +- .../resources/view/fchomo/global.js | 21 +++- .../luci-static/resources/view/fchomo/log.js | 8 +- luci-app-fchomo/po/templates/fchomo.pot | 2 +- luci-app-fchomo/po/zh_Hans/fchomo.po | 2 +- luci-app-fchomo/po/zh_Hant/fchomo.po | 2 +- .../share/luci/menu.d/luci-app-fchomo.json | 2 +- .../root/usr/share/rpcd/ucode/luci.fchomo | 2 +- luci-theme-kucat/Makefile | 2 +- .../htdocs/luci-static/kucat/css/style.css | 97 ++++++++++++------ mihomo/Makefile | 4 +- tailscale/Makefile | 4 +- v2raya/Makefile | 6 +- 16 files changed, 116 insertions(+), 57 deletions(-) create mode 100644 luci-app-fchomo/docs/audio/A!.mp3 diff --git a/luci-app-fchomo/.prepare.sh b/luci-app-fchomo/.prepare.sh index 0ed2a0e15..70069e621 100755 --- a/luci-app-fchomo/.prepare.sh +++ b/luci-app-fchomo/.prepare.sh @@ -9,7 +9,8 @@ OS=linux ARCH=amd64 JQVERSION=1.7.1 DOCNAME=Ruleset-URI-Scheme -SHARKNAME=shark-taiko.gif +SHARKIMG='img/shark-taiko.gif' +SHARKAUDIO='audio/A!.mp3' mkdir -p "$PKG_BUILD_BIN" curl -L "https://github.com/jqlang/jq/releases/download/jq-${JQVERSION}/jq-${OS}-${ARCH}" -o "$PKG_BUILD_BIN"/jq @@ -34,9 +35,13 @@ tail -n +$(( $p +1 )) $DOCNAME.html popd minify "$PKG_BUILD_DIR"/buildin.html | base64 | tr -d '\n' > "$PKG_BUILD_DIR"/base64 sed -i "s|'cmxzdHBsYWNlaG9sZGVy'|'$(cat "$PKG_BUILD_DIR"/base64)'|" "$PKG_BUILD_DIR"/htdocs/luci-static/resources/fchomo.js -# shaka +# shaka audio +sed -i "s|audio/x-wav|audio/mpeg|; + s|'UklGRiQAAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YQAAAAA='|'$(base64 "$CURDIR/docs/$SHARKAUDIO" | tr -d '\n')'|" \ +"$PKG_BUILD_DIR"/htdocs/luci-static/resources/fchomo.js +# shaka gif echo -n "'" > "$PKG_BUILD_DIR"/base64 -base64 "$CURDIR"/docs/img/$SHARKNAME | tr -d '\n' >> "$PKG_BUILD_DIR"/base64 +base64 "$CURDIR/docs/$SHARKIMG" | tr -d '\n' >> "$PKG_BUILD_DIR"/base64 echo "'" >> "$PKG_BUILD_DIR"/base64 p=$(sed -n "/'c2hhcmstdGFpa28uZ2lm'/=" "$PKG_BUILD_DIR"/htdocs/luci-static/resources/fchomo.js) { diff --git a/luci-app-fchomo/Makefile b/luci-app-fchomo/Makefile index ce00c01a9..50c7339d5 100644 --- a/luci-app-fchomo/Makefile +++ b/luci-app-fchomo/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk -LUCI_TITLE:=FullCombo Mihomo supplies maximum customization on OpenWrt. +LUCI_TITLE:=FullCombo Shark! supplies maximum customization on OpenWrt. LUCI_PKGARCH:=all LUCI_DEPENDS:= \ +mihomo \ diff --git a/luci-app-fchomo/docs/audio/A!.mp3 b/luci-app-fchomo/docs/audio/A!.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..d4b23a5213cea1060b830ddd36ad82916b14643f GIT binary patch literal 45184 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
Lmupun2rt7<|@U>8V)@b6i>q820Zs-sFdo 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 xzYe}v3%E5<1p'); + m = new form.Map('fchomo', _('FullCombo Shark!'), + 'Ciallo~(∠・ω< )⌒☆' + + ''); + m.renderContents = function(/* ... */) { + let node = form.Map.prototype.renderContents.apply(this, arguments); + + return node.then((mapEl) => { + const playButton = mapEl.querySelector('.cbi-map-descr > img'); + const audio = mapEl.querySelector('.cbi-map-descr > audio'); + + playButton.addEventListener('click', function() { + if (audio.paused) + audio.play(); + }); + + return mapEl; + }); + } s = m.section(form.NamedSection, 'config', 'fchomo'); diff --git a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/log.js b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/log.js index b6a31cf69..6398c9523 100644 --- a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/log.js +++ b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/log.js @@ -93,14 +93,14 @@ return view.extend({ s = m.section(form.NamedSection, 'config', 'fchomo'); - /* FullCombo Mihomo START */ - s.tab('fchomo', _('FullCombo Mihomo')); + /* FullCombo Shark! START */ + s.tab('fchomo', _('FullCombo Shark!')); o = s.taboption('fchomo', form.SectionValue, '_fchomo', form.NamedSection, 'config', null); ss = o.subsection; so = ss.option(form.DummyValue, '_fchomo_logview'); - so.render = L.bind(getRuntimeLog, so, _('FullCombo Mihomo'), 'fchomo'); - /* FullCombo Mihomo END */ + so.render = L.bind(getRuntimeLog, so, _('FullCombo Shark!'), 'fchomo'); + /* FullCombo Shark! END */ /* Mihomo client START */ s.tab('mihomo_c', _('Mihomo client')); diff --git a/luci-app-fchomo/po/templates/fchomo.pot b/luci-app-fchomo/po/templates/fchomo.pot index 6e9b85e75..8b89001ed 100644 --- a/luci-app-fchomo/po/templates/fchomo.pot +++ b/luci-app-fchomo/po/templates/fchomo.pot @@ -830,7 +830,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/log.js:97 #: htdocs/luci-static/resources/view/fchomo/log.js:102 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:3 -msgid "FullCombo Mihomo" +msgid "FullCombo Shark!" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:620 diff --git a/luci-app-fchomo/po/zh_Hans/fchomo.po b/luci-app-fchomo/po/zh_Hans/fchomo.po index 6b01c289b..6cd4e929e 100644 --- a/luci-app-fchomo/po/zh_Hans/fchomo.po +++ b/luci-app-fchomo/po/zh_Hans/fchomo.po @@ -848,7 +848,7 @@ msgstr "格式" #: htdocs/luci-static/resources/view/fchomo/log.js:97 #: htdocs/luci-static/resources/view/fchomo/log.js:102 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:3 -msgid "FullCombo Mihomo" +msgid "FullCombo Shark!" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:620 diff --git a/luci-app-fchomo/po/zh_Hant/fchomo.po b/luci-app-fchomo/po/zh_Hant/fchomo.po index 53b33e058..f71832ec3 100644 --- a/luci-app-fchomo/po/zh_Hant/fchomo.po +++ b/luci-app-fchomo/po/zh_Hant/fchomo.po @@ -848,7 +848,7 @@ msgstr "格式" #: htdocs/luci-static/resources/view/fchomo/log.js:97 #: htdocs/luci-static/resources/view/fchomo/log.js:102 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:3 -msgid "FullCombo Mihomo" +msgid "FullCombo Shark!" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:620 diff --git a/luci-app-fchomo/root/usr/share/luci/menu.d/luci-app-fchomo.json b/luci-app-fchomo/root/usr/share/luci/menu.d/luci-app-fchomo.json index 487ce1a4e..34e5b33bb 100644 --- a/luci-app-fchomo/root/usr/share/luci/menu.d/luci-app-fchomo.json +++ b/luci-app-fchomo/root/usr/share/luci/menu.d/luci-app-fchomo.json @@ -1,6 +1,6 @@ { "admin/services/fchomo": { - "title": "FullCombo Mihomo", + "title": "FullCombo Shark!", "order": 12, "action": { "type": "firstchild" diff --git a/luci-app-fchomo/root/usr/share/rpcd/ucode/luci.fchomo b/luci-app-fchomo/root/usr/share/rpcd/ucode/luci.fchomo index 139df850a..8efb6c651 100644 --- a/luci-app-fchomo/root/usr/share/rpcd/ucode/luci.fchomo +++ b/luci-app-fchomo/root/usr/share/rpcd/ucode/luci.fchomo @@ -24,7 +24,7 @@ function wGET(url, header, filepath) { if (!url || type(url) !== 'string') return null; - let ua = 'Wget/1.21 (FullCombo Mihomo)'; + let ua = 'Wget/1.21 (FullCombo Shark!)'; if (header) { header = json(trim(header) || {}); diff --git a/luci-theme-kucat/Makefile b/luci-theme-kucat/Makefile index a6398fc11..18d4a5134 100644 --- a/luci-theme-kucat/Makefile +++ b/luci-theme-kucat/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=luci-theme-$(THEME_NAME) LUCI_TITLE:=Kucat Theme by sirpdboy LUCI_DEPENDS:= PKG_VERSION:=2.4.9 -PKG_RELEASE:=20250114 +PKG_RELEASE:=20250209 define Package/luci-theme-$(THEME_NAME)/postinst #!/bin/sh diff --git a/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css b/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css index 3ed9782e1..308edc44b 100644 --- a/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css +++ b/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css @@ -352,7 +352,7 @@ input[type='radio']:checked { } select:not([multiple="multiple"]):focus, input:not(.cbi-button):focus, .cbi-dropdown:focus { - background-color: var(--input-hover-bgcolor); + background-color: rgba(var(--primary-rgbm),1); box-shadow: 0 0 6px rgba(0, 0, 0, 0.22); -webkit-box-shadow: 0 0 6px rgba(0, 0, 0, 0.22); -moz-box-shadow: 0 0 6px rgba(0, 0, 0, 0.22) @@ -993,7 +993,7 @@ text-decoration: none!important; padding: 1rem 1.25rem 3rem 1.25rem; } ul { - line-height: inherit; + line-height: normal; } li { list-style-type: none; @@ -1710,8 +1710,11 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ background-color: rgba(var(--primary-rgbm), 0.9); border: 1px solid rgba(var(--primary-rgbm), 1); } - +.cbi-dropdown { + padding: .2rem .2rem; +} .cbi-dynlist, .cbi-dropdown { + position: relative; display: inline-flex; min-height: 2.1875rem; @@ -1742,9 +1745,19 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ .cbi-dropdown > .open, .cbi-dropdown > .more { font-weight: bolder; background-color: rgba(255,255,255,0)!important; - display: flex; - flex-direction: column; - justify-content: center; + + font-size: 1rem; + font-weight: 900; + line-height: 2; + display: flex; + flex-direction: column; + flex-grow: 0; + flex-shrink: 0; + justify-content: center; + padding: 0 .25em; + cursor: default; + text-align: center; + outline: 0; } .cbi-dropdown > .more { font-size: var(--font-z); @@ -1756,23 +1769,7 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ .cbi-dropdown.btn > div { margin: 0px; } -.cbi-dropdown > .more, .cbi-dropdown > ul > li[placeholder] { - font-weight: bold; - display: none; - color: #777; -} -.cbi-dropdown > ul > li { - display: none; - overflow: hidden; - align-items: center; - align-self: center; - flex-grow: 1; - flex-shrink: 1; - min-height: 30px; - /* padding: 0.125rem 0.25em; */ - white-space: nowrap; - text-overflow: ellipsis; -} + .cbi-dropdown > ul > li .hide-open { display: initial; } @@ -1805,18 +1802,28 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ background: rgba(var(--primary-rgbbody), 1); color: var(--inputtext-color); } + .cbi-dropdown[open] > ul.dropdown { - /* position: revert; */ z-index: 1100; - display: table; - width: auto; + min-width: 100%; max-height: 200px !important; border: 1px solid var(--inputborder-color); background: rgba(var(--primary-rgbbody), 1); - /* box-shadow: 0 0 4px #918e8c; */ color: var(--inputtext-color); - margin-left: 0 !important; + position: absolute; + z-index: 1100; + display: block; + width: auto; + min-width: 100%; + max-width: none; + max-height: 200px; + border-bottom-left-radius: .35rem; + border-bottom-right-radius: .35rem; + color: var(--main-menu-color); + margin-left: -0.2rem !important; + left: initial !important; + right: initial !important; } .cbi-dropdown > ul > li[display], .cbi-dropdown[open] > ul.preview, .cbi-dropdown[open] > ul.dropdown > li, .cbi-dropdown[multiple] > ul > li > label, .cbi-dropdown[multiple][open] > ul.dropdown > li, .cbi-dropdown[multiple][more] > .more, .cbi-dropdown[multiple][empty] > .more { @@ -1825,9 +1832,7 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ padding: 0 10px 0 10px; flex-grow: 1; } -.cbi-dropdown[open]>ul.dropdown>li { - border-bottom: thin solid #ccc; -} + .btn:not(button) ul:not(.dropdown) li { padding: 0; } @@ -1844,12 +1849,12 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ .cbi-dropdown[open] > ul.dropdown > li .hide-close { display: initial; } -.cbi-dropdown[open] > ul.dropdown > li[selected] { +.cbi-dropdown[open]>ul.dropdown>li[selected] { background: rgba(var(--primary-rgbm), 1); color:#f8f8f8; padding-left: 10px; } -.cbi-dropdown[open] > ul.dropdown > li.focus { +.cbi-dropdown[open]>ul.dropdown>li.focus { background: rgba(var(--primary-rgbm), 1); color:#f8f8f8; } @@ -1865,6 +1870,32 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ .cbi-dropdown:not(.btn):not(.cbi-button) { padding: 0; } + +.cbi-dropdown > ul > li { + display: none; + overflow: hidden; + align-items: center; + align-self: center; + flex-grow: 1; + flex-shrink: 1; + min-height: 30px; + padding: 0.25em; + white-space: nowrap; + text-overflow: ellipsis; +} +.cbi-dropdown > .more, .cbi-dropdown > ul > li[placeholder] { + font-weight: bold; + display: none; + color: #777; +} +.cbi-dropdown[empty]>ul>li, .cbi-dropdown[optional][open]>ul.dropdown>li[placeholder], .cbi-dropdown[multiple][open]>ul.dropdown>li>form { + display: block; +} +.cbi-dropdown[open]>ul.dropdown>li { + border-bottom: thin solid #ccc; + padding: .5rem .8rem; + color: #222; +} .cbi-dropdown[open] > ul.dropdown > li > input.create-item-input:first-child:last-child { width: 100%; } diff --git a/mihomo/Makefile b/mihomo/Makefile index db51471f2..6027a000e 100644 --- a/mihomo/Makefile +++ b/mihomo/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mihomo -PKG_VERSION:=1.19.1 +PKG_VERSION:=1.19.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/metacubex/mihomo/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=cf32a96bea6caeb2769e86e3001da67d332a673fc6db703b5bc1a5d14754daa1 +PKG_HASH:=8afa33b5eb9fc20e521a986be5e21908b53858e4b2350b56e0bf3495b740c4dc PKG_MAINTAINER:=Anya Lin PKG_LICENSE:=GPL-2.0 diff --git a/tailscale/Makefile b/tailscale/Makefile index 7c536a8b4..a4c467944 100644 --- a/tailscale/Makefile +++ b/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.78.1 +PKG_VERSION:=1.80.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=dbc25cc241bb233f183475f003d5508af7b45add1ca548b35a6a6fea91fb91af +PKG_HASH:=3dc0e5f903912ba5ada04c807501550b2d434111d1080b11099672d3dfd5c3f3 PKG_MAINTAINER:=Zephyr Lykos , \ Sandro Jäckel diff --git a/v2raya/Makefile b/v2raya/Makefile index 180e01167..3e8e92840 100644 --- a/v2raya/Makefile +++ b/v2raya/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA -PKG_VERSION:=2.2.6.4 +PKG_VERSION:=2.2.6.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=801873bb5d8f3fe3d27b26b8b9b4876d7dbd4ffee433344169cc5ebf8070499d +PKG_HASH:=9ca40d9a19ffc46e6c27ad4214e958f3430d03e87352dbcaf4f15a8f65bdaac0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service PKG_LICENSE:=AGPL-3.0-only @@ -60,7 +60,7 @@ define Download/v2raya-web URL:=https://github.com/v2rayA/v2rayA/releases/download/v$(PKG_VERSION)/ URL_FILE:=web.tar.gz FILE:=$(WEB_FILE) - HASH:=7625e71d9592855dc283b28eabd740d2c2851c7755e893005fc57aca03f9760f + HASH:=a30bd587b607e168cd6b34f71630418a09d88491349300e69bfcd39dc46f68f3 endef define Build/Prepare