From 44face2f647e8eda7aeab6ba05763ef1c2e27107 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Thu, 20 Feb 2025 00:23:45 +0800 Subject: [PATCH] update 2025-02-20 00:23:45 --- .../luci-static/resources/view/alist/basic.js | 2 +- luci-app-alist/po/zh_Hans/alist.po | 10 ++-- .../htdocs/luci-static/kucat/css/style.css | 49 ++++++++++--------- toml11/Makefile | 4 +- udp2raw/Makefile | 4 +- wxbase/Makefile | 4 +- 6 files changed, 38 insertions(+), 35 deletions(-) diff --git a/luci-app-alist/htdocs/luci-static/resources/view/alist/basic.js b/luci-app-alist/htdocs/luci-static/resources/view/alist/basic.js index f522573b5..40ddf312b 100644 --- a/luci-app-alist/htdocs/luci-static/resources/view/alist/basic.js +++ b/luci-app-alist/htdocs/luci-static/resources/view/alist/basic.js @@ -364,7 +364,7 @@ return view.extend({ o = s.taboption('ftp', form.Flag, 'disable_active_mode', _('Disable active transfer mode')); o.rmempty = false; - o = s.taboption('ftp', form.Flag, 'default_transfer_binary', _('Binary mode transmission')); + o = s.taboption('ftp', form.Flag, 'default_transfer_binary', _('Enable binary transfer mode')); o.rmempty = false; o = s.taboption('ftp', form.Flag, 'enable_active_conn_ip_check', _('Client IP check in active transfer mode')); diff --git a/luci-app-alist/po/zh_Hans/alist.po b/luci-app-alist/po/zh_Hans/alist.po index 6f0c4524f..3751f05b9 100644 --- a/luci-app-alist/po/zh_Hans/alist.po +++ b/luci-app-alist/po/zh_Hans/alist.po @@ -237,7 +237,7 @@ msgid "FTP Port" msgstr "FTP 端口" msgid "Max retries on port conflict during passive transfer" -msgstr "被动传输端口冲突时重试最大次数" +msgstr "被动传输端口冲突时最大重试次数" msgid "Enable non-20 port for active transfer" msgstr "启用非 20 端口进行主动传输" @@ -251,14 +251,14 @@ msgstr "连接超时（秒）" msgid "Disable active transfer mode" msgstr "禁用主动传输模式" -msgid "Binary mode transmission" -msgstr "二进制模式传输" +msgid "Enable binary transfer mode" +msgstr "启用二进制传输模式" msgid "Client IP check in active transfer mode" -msgstr "主动传输模式下客户端 IP 检查" +msgstr "主动传输模式下对客户端进行 IP 检查" msgid "Client IP check in passive transfer mode" -msgstr "被动传输模式下客户端 IP 检查" +msgstr "被动传输模式下对客户端进行 IP 检查" msgid "Enabled SFTP" msgstr "启用 SFTP" 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 2a94f0a66..77fe37c6b 100644 --- a/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css +++ b/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css @@ -205,7 +205,7 @@ html, body { padding: 0 !important; } body { - letter-spacing: 0.050em; + letter-spacing: 0.05em; font-size: var(--font-z); color: var(--body-color); background-position: top center; @@ -215,9 +215,6 @@ body { background-size: cover; background-repeat: no-repeat; } -body div { - line-height: 120% -} a { color: var(--primary-title-color); @@ -297,7 +294,6 @@ select, .cbi-dropdown { select option { background-color: rgba(var(--primary-rgbbody), 0.8); width: 100%!important; - height: 2rem; overflow: hidden; } @@ -543,7 +539,7 @@ small { .main-right > #maincontent { position: relative; background-color: rgba(var(--primary-rgbbody), var(--primary-rgbm-ts)); - padding: 1rem 1.25rem 3rem 1.25rem; + padding: 0.2rem 0.2rem 3rem 0.2rem; z-index: 50 } @@ -1512,7 +1508,7 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ display: inline-block; width: 100%; padding: 0 0.8rem; - line-height: 2.4rem; + line-height: 2.8rem; } @@ -1525,7 +1521,8 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ margin-bottom:20px; } -.cbi-filebrowser.open .upload { +.cbi-filebrowser .upload, +.cbi-filebrowser>.right>.upload { display: inline-flex; } .cbi-value.cbi-value-last { @@ -1729,6 +1726,10 @@ button:hover, .btn:hover, .cbi-button:hover ,.item:hover{ } +.cbi-dropdown { + padding: .2rem .2rem; +} + .cbi-dropdown[placeholder*="select"] { max-width: 25rem; height: auto; @@ -1939,6 +1940,7 @@ select[multiple="multiple"] { select, input { padding: 0 20px 0 10px; + line-height: 2rem; margin: 0.2rem 0.2rem 0.2rem 0; } @@ -2001,17 +2003,13 @@ select, input { background-color: rgba(var(--primary-rgbbody), 1); box-shadow: 0 2px 10px 0px rgba(255, 255, 255, .16), 0 0 10px 0 rgba(255, 255, 255, .12); } + #modal_overlay .cbi-section, .modal .cbi-section{ overflow: visible; } -/* -.modal .right>.btn { - padding: 0 0.8rem -} -*/ .modal .right>.primary { - padding: .3rem .6rem; + min-width: 8rem; } .modal [data-tab-active="true"] { @@ -2037,6 +2035,12 @@ select, input { line-height: 1.8; } +#modal_overlay .modal>div { + display: flex; + flex-direction: row; + justify-content: center; +} + .modal > pre, .modal > textarea { font-size: var(--font-z); font-size-adjust: .35; @@ -2160,7 +2164,7 @@ body.modal-overlay-active #modal_overlay { } .spinning { position: relative; - font-size: 1rem; + font-size: var(--font-z); padding-left: 32px !important; } .spinning::before { @@ -2186,10 +2190,7 @@ body.modal-overlay-active #modal_overlay { text-align: left !important; margin-left: 5px; } -.right .cbi-button { - line-height: 1; - margin: 0; -} + .right, .right::before { text-align: right !important; margin-right: 5px; @@ -3167,14 +3168,12 @@ background-color: rgba(255,255,255,0.12)!important; width: 15rem; } -[data-page="admin-network-network "] .main #view td:nth-child(3), +[data-page="admin-status-processes"] #view td:nth-child(3)>span, .cbi-map>.cbi-section .cbi-value:nth-of-type(4) td:nth-child(2), .Interfaces > .main #view td:nth-child(3), .node-admin-network-network > .main #view td:nth-child(3), .Processes > .main #view td:nth-child(3), .node-admin-status-processes > .main #view td:nth-child(3), .node-admin-status-overview > .main #view td:nth-child(2) { white-space: normal !important; -} - -[data-page="admin-status-processes"] #view td:nth-child(3)>span { word-break: unset!important; } + .node-admin-status-overview #view .cbi-section>div>div { justify-items: center !important } @@ -3375,6 +3374,10 @@ pre.command-output { overflow-x: auto; overflow-y: hidden; } +[data-page="admin-system-reboot"] #maincontent>.container>#view, +[data-page="admin-system-poweroffdevice"] #maincontent .container { + padding: 0 1rem 3rem 1rem; +} .node-admin-network-diagnostics #view .table{ margin-top: 2rem; } diff --git a/toml11/Makefile b/toml11/Makefile index e1d95bafa..55358b60a 100644 --- a/toml11/Makefile +++ b/toml11/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=toml11 -PKG_VERSION:=3.8.1 +PKG_VERSION:=4.4.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ToruNiina/toml11/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6a3d20080ecca5ea42102c078d3415bef80920f6c4ea2258e87572876af77849 +PKG_HASH:=815bfe6792aa11a13a133b86e7f0f45edc5d71eb78f5fb6686c49c7f792b9049 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/udp2raw/Makefile b/udp2raw/Makefile index 2d9520915..6c201d2b5 100644 --- a/udp2raw/Makefile +++ b/udp2raw/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=udp2raw -PKG_VERSION:=20200818.0 +PKG_VERSION:=20230206.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/wangyu-/udp2raw/tar.gz/$(PKG_VERSION)? -PKG_HASH:=1e5bf4eb7b7ad94f4cf358614ecc6d7069409486220aa6d080a56ecab2fc2cd8 +PKG_HASH:=1e459020654d3c65acb252a56fe11a5e2feec5a64d6e2ffd0aacc14213bbc9c0 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/wxbase/Makefile b/wxbase/Makefile index 68fbde300..237f2722f 100644 --- a/wxbase/Makefile +++ b/wxbase/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wxbase -PKG_VERSION:=3.2.5 +PKG_VERSION:=3.2.6 PKG_RELEASE:=1 PKG_SOURCE:=wxWidgets-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/wxWidgets/wxWidgets/releases/download/v$(PKG_VERSION) -PKG_HASH:=0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51 +PKG_HASH:=939e5b77ddc5b6092d1d7d29491fe67010a2433cf9b9c0d841ee4d04acb9dce7 PKG_BUILD_DIR:=$(BUILD_DIR)/wxWidgets-$(PKG_VERSION) PKG_CHECK_FORMAT_SECURITY:=0