From 2207d56a4eb996e611bc58072e1fe85adf52aaad Mon Sep 17 00:00:00 2001 From: lutinglt Date: Tue, 10 Jun 2025 17:34:09 +0800 Subject: [PATCH] 1.24.0 --- .github/release.md | 5 +- .gitignore | 1 - deno.lock | 170 +++++++++++++++++++++++++++++ src/styles/components/actions.scss | 8 +- src/styles/components/repo.scss | 9 +- src/styles/public/button.scss | 1 + src/styles/public/dropdown.scss | 6 +- src/styles/public/label.scss | 34 +----- src/styles/public/svg.scss | 6 + src/themes/dark/gitea-dark.css | 25 +++++ theme.yml | 2 +- 11 files changed, 222 insertions(+), 45 deletions(-) create mode 100644 deno.lock diff --git a/.github/release.md b/.github/release.md index cf7ed3b..1c168c8 100644 --- a/.github/release.md +++ b/.github/release.md @@ -3,4 +3,7 @@ #### 更符合 GitHub 风格 - 仓库导航栏文字颜色优化 -- Action执行时间位置优化 \ No newline at end of file +- Action执行时间位置优化 +- 优化侧边栏间隔 +- 优化下拉菜单项目边距 +- 关闭工单按钮为紫色 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4a1b0b7..0841ed3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ dist node_modules -deno.lock package-lock.json \ No newline at end of file diff --git a/deno.lock b/deno.lock new file mode 100644 index 0000000..4e8b778 --- /dev/null +++ b/deno.lock @@ -0,0 +1,170 @@ +{ + "version": "4", + "specifiers": { + "npm:@types/node@*": "22.5.4", + "npm:js-yaml@*": "4.1.0", + "npm:js-yaml@^4.1.0": "4.1.0", + "npm:sass@*": "1.84.0", + "npm:sass@1.84.0": "1.84.0", + "npm:sass@^1.83.0": "1.84.0" + }, + "npm": { + "@parcel/watcher-android-arm64@2.5.1": { + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==" + }, + "@parcel/watcher-darwin-arm64@2.5.1": { + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==" + }, + "@parcel/watcher-darwin-x64@2.5.1": { + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==" + }, + "@parcel/watcher-freebsd-x64@2.5.1": { + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==" + }, + "@parcel/watcher-linux-arm-glibc@2.5.1": { + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==" + }, + "@parcel/watcher-linux-arm-musl@2.5.1": { + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==" + }, + "@parcel/watcher-linux-arm64-glibc@2.5.1": { + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==" + }, + "@parcel/watcher-linux-arm64-musl@2.5.1": { + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==" + }, + "@parcel/watcher-linux-x64-glibc@2.5.1": { + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==" + }, + "@parcel/watcher-linux-x64-musl@2.5.1": { + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==" + }, + "@parcel/watcher-win32-arm64@2.5.1": { + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==" + }, + "@parcel/watcher-win32-ia32@2.5.1": { + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==" + }, + "@parcel/watcher-win32-x64@2.5.1": { + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==" + }, + "@parcel/watcher@2.5.1": { + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dependencies": [ + "@parcel/watcher-android-arm64", + "@parcel/watcher-darwin-arm64", + "@parcel/watcher-darwin-x64", + "@parcel/watcher-freebsd-x64", + "@parcel/watcher-linux-arm-glibc", + "@parcel/watcher-linux-arm-musl", + "@parcel/watcher-linux-arm64-glibc", + "@parcel/watcher-linux-arm64-musl", + "@parcel/watcher-linux-x64-glibc", + "@parcel/watcher-linux-x64-musl", + "@parcel/watcher-win32-arm64", + "@parcel/watcher-win32-ia32", + "@parcel/watcher-win32-x64", + "detect-libc", + "is-glob", + "micromatch", + "node-addon-api" + ] + }, + "@types/node@22.5.4": { + "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", + "dependencies": [ + "undici-types" + ] + }, + "argparse@2.0.1": { + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "braces@3.0.3": { + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dependencies": [ + "fill-range" + ] + }, + "chokidar@4.0.3": { + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dependencies": [ + "readdirp" + ] + }, + "detect-libc@1.0.3": { + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==" + }, + "fill-range@7.1.1": { + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dependencies": [ + "to-regex-range" + ] + }, + "immutable@5.0.3": { + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==" + }, + "is-extglob@2.1.1": { + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + }, + "is-glob@4.0.3": { + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": [ + "is-extglob" + ] + }, + "is-number@7.0.0": { + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "js-yaml@4.1.0": { + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": [ + "argparse" + ] + }, + "micromatch@4.0.8": { + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dependencies": [ + "braces", + "picomatch" + ] + }, + "node-addon-api@7.1.1": { + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==" + }, + "picomatch@2.3.1": { + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + }, + "readdirp@4.1.1": { + "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==" + }, + "sass@1.84.0": { + "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==", + "dependencies": [ + "@parcel/watcher", + "chokidar", + "immutable", + "source-map-js" + ] + }, + "source-map-js@1.2.1": { + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==" + }, + "to-regex-range@5.0.1": { + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": [ + "is-number" + ] + }, + "undici-types@6.19.8": { + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" + } + }, + "workspace": { + "packageJson": { + "dependencies": [ + "npm:js-yaml@^4.1.0", + "npm:sass@^1.83.0" + ] + } + } +} diff --git a/src/styles/components/actions.scss b/src/styles/components/actions.scss index db6ec3f..7f142c8 100644 --- a/src/styles/components/actions.scss +++ b/src/styles/components/actions.scss @@ -97,12 +97,8 @@ // 手动工作流下拉列表 #runWorkflowDispatchForm { // 分支选择按钮 - .ui.dropdown.button.branch-selector-dropdown { - padding: 8px 24px 8px 8px; - - svg.octicon-git-branch { - margin-right: 6px; - } + .ui.dropdown.button.branch-selector-dropdown .svg.octicon-git-branch { + margin-right: 6px; } } diff --git a/src/styles/components/repo.scss b/src/styles/components/repo.scss index 2e281cc..f722e59 100644 --- a/src/styles/components/repo.scss +++ b/src/styles/components/repo.scss @@ -24,7 +24,6 @@ svg { color: #9198a1; - margin-right: 6px; } } @@ -101,7 +100,7 @@ background: #f78166; border-radius: 0.375rem; bottom: calc(50% - 1.8rem); - content: ''; + content: ""; height: 2px; position: absolute; right: 50%; @@ -199,7 +198,7 @@ } } - .ui.sha.label { + .ui.label { display: none; } } @@ -290,12 +289,14 @@ } .flex-item { + padding: 10px 0 0 0; + .flex-item-title { margin-top: 2px; } .flex-item-body { - padding: 8px 0; + padding: 8px 0 0 0; .repo-description { color: #f0f6fc; diff --git a/src/styles/public/button.scss b/src/styles/public/button.scss index eb9c225..d903ed7 100644 --- a/src/styles/public/button.scss +++ b/src/styles/public/button.scss @@ -1,5 +1,6 @@ // Made by Luting ^-^ .ui.button { + min-height: unset; font-weight: 500; padding: 9px 16px; } diff --git a/src/styles/public/dropdown.scss b/src/styles/public/dropdown.scss index cfff471..19ca3ac 100644 --- a/src/styles/public/dropdown.scss +++ b/src/styles/public/dropdown.scss @@ -72,7 +72,7 @@ .item { display: block; - padding: 11px 16px; + padding: 8px 10px; text-align: left; text-transform: none; line-height: 1em; @@ -98,6 +98,10 @@ overflow: hidden auto; box-shadow: 0px 0px 0px 0.5px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966; animation: 200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running overlay-appear; + + >.item { + padding: 8px 10px !important; + } } .ui.dropdown .menu, diff --git a/src/styles/public/label.scss b/src/styles/public/label.scss index cfc0b3b..2303e90 100644 --- a/src/styles/public/label.scss +++ b/src/styles/public/label.scss @@ -45,14 +45,12 @@ span, color: var(--color-blue); background-color: #388bfd33; border: 1px solid var(--color-blue); - border-radius: 25px; } &.basic.primary.label { color: var(--color-blue); background-color: #388bfd33 !important; border-color: #1f6feb !important; - border-radius: 25px !important; } // 发布&Runner 状态标签 @@ -103,7 +101,7 @@ a.ui.ui.ui { } } - &:not(.basic, .sha) { + &:not(.basic, .sha, .commit-id-short, .commit-sign-badge) { color: var(--color-blue); background: #121d2f; border-radius: 25px; @@ -139,7 +137,7 @@ a.ui.ui.ui { opacity: 1; } } -a.ui.label:not(.basic, .sha):hover { +a.ui.label:not(.basic, .sha, .commit-id-short, .commit-sign-badge):hover { color: #fff; background: #1f6feb; border-radius: 25px; @@ -148,35 +146,9 @@ a.ui.label:not(.basic, .sha):hover { border: 0 !important; } -.repository #commits-table .commit-list .ui.label.sha { +.repository #commits-table .commit-list .sha .ui.label { line-height: 18px; margin-top: 0.375rem; margin-bottom: 0.375rem; margin-left: -2px; } - -.repository { - #commits-table td.sha, - #repo-files-table, - #repo-file-commit-box, - #rev-list, - .timeline-item.commits-list .singular-commit { - .sha.label { - .detail.icon { - border: 0; - background: unset; - } - &.isSigned { - &.isWarning, - &.isVerified, - &.isVerifiedUntrusted, - &.isVerifiedUnmatched { - .detail.icon { - border: 0; - background: unset; - } - } - } - } - } -} diff --git a/src/styles/public/svg.scss b/src/styles/public/svg.scss index 6fa74e0..f4b38a5 100644 --- a/src/styles/public/svg.scss +++ b/src/styles/public/svg.scss @@ -7,3 +7,9 @@ color: #3fb950 !important; } } + +.svg { + &.octicon-issue-closed { + color: #ab7df8 !important; + } +} diff --git a/src/themes/dark/gitea-dark.css b/src/themes/dark/gitea-dark.css index 02567d5..fd08d15 100644 --- a/src/themes/dark/gitea-dark.css +++ b/src/themes/dark/gitea-dark.css @@ -2,6 +2,7 @@ :root { --is-dark-theme: true; --border-radius: 6px; + --color-primary: var(--color-blue); --color-primary-contrast: #fff; --color-primary-dark-1: #739cb3; @@ -29,6 +30,7 @@ --color-primary-alpha-90: #3683c0e1; --color-primary-hover: var(--color-primary-light-1); --color-primary-active: var(--color-primary-light-2); + --color-secondary: #3d444d; --color-secondary-dark-1: #505665; --color-secondary-dark-2: #5b6273; @@ -56,6 +58,7 @@ --color-secondary-alpha-70: #2c2f35b3; --color-secondary-alpha-80: #2c2f35cc; --color-secondary-alpha-90: #2c2f35e1; + --color-red: #da3737; --color-orange: #f17a2b; --color-yellow: #f3c640; @@ -71,6 +74,7 @@ --color-grey: #797c85; --color-gold: #d4b74c; --color-white: #ffffff; + --color-red-light: #d15a5a; --color-orange-light: #f6a066; --color-yellow-light: #eaaf03; @@ -83,6 +87,7 @@ --color-pink-light: #d74397; --color-brown-light: #b08061; --color-black-light: #3f4555; + --color-red-dark-1: #c23636; --color-orange-dark-1: #f38236; --color-yellow-dark-1: #b88a03; @@ -95,6 +100,7 @@ --color-pink-dark-1: #be297d; --color-brown-dark-1: #94674a; --color-black-dark-1: #292d38; + --color-red-dark-2: #ad3030; --color-orange-dark-2: #f16e17; --color-yellow-dark-2: #a37a02; @@ -107,6 +113,7 @@ --color-pink-dark-2: #a9246f; --color-brown-dark-2: #835b42; --color-black-dark-2: #252832; + --color-ansi-black: var(--color-black); --color-ansi-red: var(--color-red); --color-ansi-green: var(--color-green); @@ -123,6 +130,7 @@ --color-ansi-bright-magenta: var(--color-pink-light); --color-ansi-bright-cyan: var(--color-teal-light); --color-ansi-bright-white: var(--color-console-fg); + --color-console-fg: #f0f6fc; --color-console-fg-subtle: #9198a1; --color-console-bg: #010409; @@ -131,10 +139,12 @@ --color-console-hover-bg: #15191f; --color-console-menu-bg: var(--color-body); --color-console-menu-border: var(--color-light-border); + --color-grey: #505665; --color-grey-light: #a1a6b7; --color-gold: #b1983b; --color-white: #fff; + --color-diff-removed-word-bg: #792e2d; --color-diff-added-word-bg: #1d572d; --color-diff-removed-row-bg: #25171c; @@ -144,52 +154,67 @@ --color-diff-moved-row-border: #bcca6f; --color-diff-added-row-border: #314a37; --color-diff-inactive: #353846; + --color-error-border: #792e2e; --color-error-bg: #26181d; --color-error-bg-active: #744; --color-error-bg-hover: #633; --color-error-text: #f85149; + --color-success-border: #1d572d; --color-success-bg: #12261e; --color-success-text: #39d353; + --color-warning-border: #624711; --color-warning-bg: #272115; --color-warning-text: #fbbd08; + --color-info-border: #214a81; --color-info-bg: #121d2f; --color-info-text: #4493f8; + --color-red-badge: #db2828; --color-red-badge-bg: #db28281a; --color-red-badge-hover-bg: #db28284d; + --color-green-badge: #39d353; --color-green-badge-bg: #12261e; --color-green-badge-hover-bg: #153d22; + --color-yellow-badge: #fbbd08; --color-yellow-badge-bg: #fbbd081a; --color-yellow-badge-hover-bg: #fbbd084d; + --color-orange-badge: #f2711c; --color-orange-badge-bg: #f2711c1a; --color-orange-badge-hover-bg: #f2711c4d; + --color-git: #f05133; --color-body: #0d1117; + --color-box-header: #151b23; --color-box-body: #0d1117; --color-box-body-highlight: #262c36; + --color-text-dark: #dbe0ea; --color-text: #dce2e7; --color-text-light: #a6aab5; --color-text-light-1: rgb(125, 133, 144); --color-text-light-2: #8a8e99; --color-text-light-3: #707687; + --color-footer: #010409; --color-timeline: #4c525e; + --color-input-text: #d5dbe6; --color-input-background: #2c2f35; --color-input-toggle-background: #454a57; --color-input-border: var(--color-light-border); --color-input-border-hover: var(--color-light-border); + --color-header-wrapper: #0d1117; --color-header-wrapper-transparent: #20243000; + --color-light: #00000028; --color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled))); --color-light-border: #3d444d; diff --git a/theme.yml b/theme.yml index be5b6f1..7bb2e4a 100644 --- a/theme.yml +++ b/theme.yml @@ -1,3 +1,3 @@ gitea: - version: 1.23.3 + version: 1.24.0 themes: [dark] \ No newline at end of file