From 5422d19711608adee0996a0b2caa6b2d97f7f87f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 13 Jun 2024 15:26:14 +0000 Subject: [PATCH] feat: latest CI/CD tools --- charts/kubezero-ci/README.md | 10 +- .../files/gitea/themes/theme-github-dark.css | 1062 ++++++++--------- charts/kubezero-ci/update.sh | 3 + charts/kubezero-ci/values.yaml | 7 +- 4 files changed, 519 insertions(+), 563 deletions(-) diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index 2e80ad0f..d8c29102 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -1,6 +1,6 @@ # kubezero-ci -![Version: 0.8.11](https://img.shields.io/badge/Version-0.8.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.8.12](https://img.shields.io/badge/Version-0.8.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things CI @@ -20,9 +20,9 @@ Kubernetes: `>= 1.25.0` |------------|------|---------| | https://aquasecurity.github.io/helm-charts/ | trivy | 0.7.0 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jenkins.io | jenkins | 5.1.18 | -| https://dl.gitea.io/charts/ | gitea | 10.1.4 | -| https://docs.renovatebot.com/helm-charts | renovate | 37.368.2 | +| https://charts.jenkins.io | jenkins | 5.2.1 | +| https://dl.gitea.io/charts/ | gitea | 10.2.0 | +| https://docs.renovatebot.com/helm-charts | renovate | 37.406.2 | # Jenkins - default build retention 10 builds, 32days @@ -67,7 +67,6 @@ Kubernetes: `>= 1.25.0` | gitea.gitea.metrics.enabled | bool | `false` | | | gitea.gitea.metrics.serviceMonitor.enabled | bool | `true` | | | gitea.image.rootless | bool | `true` | | -| gitea.image.tag | string | `"1.21.11"` | | | gitea.istio.enabled | bool | `false` | | | gitea.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | gitea.istio.url | string | `"git.example.com"` | | @@ -91,6 +90,7 @@ Kubernetes: `>= 1.25.0` | jenkins.agent.idleMinutes | int | `30` | | | jenkins.agent.image.repository | string | `"public.ecr.aws/zero-downtime/jenkins-podman"` | | | jenkins.agent.image.tag | string | `"v0.5.0"` | | +| jenkins.agent.inheritYamlMergeStrategy | bool | `true` | | | jenkins.agent.podName | string | `"podman-aws"` | | | jenkins.agent.podRetention | string | `"Default"` | | | jenkins.agent.resources.limits.cpu | string | `""` | | diff --git a/charts/kubezero-ci/files/gitea/themes/theme-github-dark.css b/charts/kubezero-ci/files/gitea/themes/theme-github-dark.css index 900c8363..30920d08 100644 --- a/charts/kubezero-ci/files/gitea/themes/theme-github-dark.css +++ b/charts/kubezero-ci/files/gitea/themes/theme-github-dark.css @@ -1,42 +1,116 @@ :root { - --color-primary: #347d39; - --color-secondary: #373e47; + --is-dark-theme: true; --border-radius: 6px; + --color-white: #e6edf3; + --color-red: #da3633; + --color-orange: #c9510c; + --color-yellow: #d29922; + --color-blue: #4493f8; + --color-purple: #8957e5; + --color-green: #238636; + --color-green-light: #16ab39; + --color-primary: var(--color-green); + --color-primary-hover: #29903b; + --color-primary-active: #2e9a40; + --color-primary-light-4: #0e4429; + --color-primary-light-2: #006d32; + --color-primary-dark-2: #26a641; + --color-primary-dark-4: #39d353; + --color-primary-contrast: #ffffff; + --color-secondary: #30363d; + --color-secondary-alpha-60: #161b22; + --color-secondary-alpha-40: rgba(48, 54, 61, 0.4); + --color-secondary-bg: #30363d; + --color-light-border: var(--color-secondary); --color-body: #0d1117; - --color-navbar: #161b22; + --color-card: var(--color-body); + --color-navbar: #010409; --color-footer: #161b22; - --color-text-light: #a6aab5; - --color-text-light-2: #adbac7; - --color-grey-light: var(--color-text-light); --color-text: #bbc0ca; + --color-text-dark: #bbc0ca; + --color-text-light: #a6aab5; + --color-text-light-1: #848d97; + --color-text-light-2: #a6aab5; + --color-timeline: #21262d; + --color-grey-light: var(--color-text-light); --color-box-body: #22272e; --color-markup-code-block: #636e7b66; --color-light: #22272e; --color-button: #22272e; + --color-expand-button: var(--color-body); --color-input-background: #22272e; - --color-input-border-hover: #8e8c8c; + --color-input-border-hover: var(--color-secondary); --color-input-text: #adbac7; --color-box-header: #22272e; --color-active: #22272e; - --color-menu: #22272e; + --color-active-line: #272114; + --color-menu: #161b22; --color-caret: var(--color-text); - --is-dark-theme: true; - --color-blue: #4796f9; - --color-input-background: #22272e; - --color-primary-contrast: #adbac7; - --color-text-light-2: #a6aab5; - --color-box-body: #161b22; + --color-box-body: var(--color-body); --color-box-header: #161b22; - --color-green-light: #16ab39; - --color-nav-bg: #161b22; - --color-header-wrapper: #161b22; - --color-nav-hover-bg: #808080; + --color-nav-bg: #010409; + --color-header-wrapper: #010409; + --color-nav-hover-bg: rgba(177, 186, 196, 0.12); + --color-hover: #292e36; + --color-label-bg: rgba(56, 139, 253, 0.1); + --color-label-hover-bg: #1f6feb; + --color-label-text: var(--color-blue); + --color-error-bg: #b62324; + --color-error-border: #f8514966; + --color-error-text: var(--color-white); + --color-success-bg: #122117; + --color-success-border: #2ea04366; + --color-success-text: var(--color-green); + --color-info-bg: rgba(56, 139, 253, 0.1); + --color-info-border: rgba(56, 139, 253, 0.4); + --color-info-text: var(--color-blue); + --color-warning-bg: rgba(187, 128, 9, 0.1); + --color-warning-border: rgba(187, 128, 9, 0.4); + --color-warning-text: var(--color-yellow); /* code editor colors are set in https://github.com/go-gitea/gitea/blob/f5b300ea77081a1b78ac044cb1c0f9225538d091/web_src/js/features/codeeditor.js#L82-L97. */ /* monaco editor dark theme is toggled via variable `--is-dark-theme` */ --color-primary-light-3: #71798e; - --color-editor-line-highlight: #71798e; - --color-code-bg: var(--color-input-background); + --color-editor-line-highlight: var(--color-body); + --color-code-bg: var(--color-body); + + --color-diff-removed-row-bg: rgba(248, 81, 73, 0.15); + --color-diff-removed-row-border: rgba(248, 81, 73, 0.3); + --color-diff-removed-word-bg: rgba(248, 81, 73, 0.4); + --color-diff-added-row-bg: rgba(46, 160, 67, 0.15); + --color-diff-added-row-border: rgba(46, 160, 67, 0.3); + --color-diff-added-word-bg: rgba(46, 160, 67, 0.4); + --color-diff-inactive: var(--color-secondary-alpha-60); +} + +.text.primary, +.flex-item a:not(.label, .button):hover { + color: var(--color-blue) !important; +} + +.svg:not(.text) { + fill: var(--color-text-light-1); +} +.label > .svg, +.btn > .svg, +.button > .svg, +.badge.gt-text-white > .svg, +.card > .svg, +a:not(.item):hover > .svg, +.dropdown:hover .svg, +.ui.attached.menu:not(.new-menu) .item .svg { + fill: currentColor; +} +.markdown-toolbar-button:hover { + background-color: var(--color-secondary); + border-radius: var(--border-radius); +} + +.page-content.dashboard, +.page-content.explore, +.page-content.repository:not(.new), +.page-content.signin { + margin-top: 10px; } .ui.list .list > .item > .content, @@ -51,33 +125,22 @@ .ui.repository.list, .ui.user.list { - background: var(--color-box-body); + background: var(--color-box-header); padding: 1em; border-radius: 0.75em; } +.ui.avatar:not(.org-avatar) { + border-radius: 50% !important; + box-shadow: 0 0 0 1px var(--color-secondary); +} + .ui.header .sub.header { color: #636e7b; } -.ui .error.header { - border-color: var(--color-red) !important; - background-color: var(--color-red) !important; - color: #cdd9e5fff !important; -} - -.ui.modal > .header { - background: var(--color-secondary); - color: #dbdbdb; -} - .ui.modal > .actions { - background: var(--color-secondary); - border-color: var(--color-secondary); -} - -.ui.modal > .content { - background: #383c4a; + background: var(--color-body) !important; } .ui.green.buttons .button, @@ -88,28 +151,33 @@ padding: 5px 10px; } -.repository.file.list #repo-files-table tbody .svg.octicon-file-directory, -.repository.file.list #repo-files-table tbody .svg.octicon-file-submodule { - color: #768390; -} - a, .ui.breadcrumb a { - /* color: var(--color-text); */ color: var(--color-blue); } +a[href="#"] { + color: var(--color-text); +} +a:hover, +a.muted:hover, +.ui.breadcrumb a:hover, +.ui.floating.jump.select-label.dropdown:hover, +.ui.floating.jump.select-milestone.dropdown:hover, +.ui.floating.jump.select-project.dropdown:hover, +.ui.floating.jump.select-assignees.dropdown:hover, +.muted-links a:hover { + color: var(--color-blue); +} +a.text:not(.primary):hover, +a.muted.text:hover, +.ui.breadcrumb a.text:hover, +.muted-links a:hover { + text-decoration: none; +} +.flex-item .flex-item-title a, .repo-title a { - color: var(--color-blue) !important; -} - -.ui.table > thead > tr > th { - background: #636e7b1a; - color: #dbdbdb !important; -} - -.repository.file.list #repo-files-table tr { - background: #22272e; + color: var(--color-white); } .repo-icon { @@ -118,6 +186,14 @@ a, margin-right: -0.05rem !important; } +.interact-fg:hover { + color: var(--color-blue) !important; +} + +.repository.file.list .file-actions .btn-octicon:hover { + color: var(--color-blue) !important; +} + .repository.file.list #file-buttons .ui.button { color: #cdd9e5 !important; } @@ -126,30 +202,35 @@ a, .ui.basic.green.buttons .button, .ui.basic.primary.button, .ui.basic.primary.buttons .button { - background-color: #22272e !important; - box-shadow: inset 0 0 0 1px rgba(34, 36, 38, 0.15) !important; - color: #cdd9e5 !important; -} - -.ui.basic.green.button:focus, -.ui.basic.green.buttons .button:focus, -.ui.basic.primary.button:focus, -.ui.basic.primary.buttons .button:focus { - box-shadow: inset 0 0 0 0px #808080 !important; + background-color: var(--color-button); } .ui.basic.green.button:hover, .ui.basic.green.buttons .button:hover, .ui.basic.primary.button:hover, .ui.basic.primary.buttons .button:hover { - background-color: #22272e !important; + background-color: var(--color-hover); } -.ui.basic.green.button:hover, -.ui.basic.green.buttons .button:hover, -.ui.basic.primary.button:hover, -.ui.basic.primary.buttons .button:hover { - box-shadow: inset 0 0 0 0px #808080 !important; +.ui.basic.red.buttons .button, +.ui.basic.red.button, +.ui.basic.red.buttons .button:focus, +.ui.basic.red.button:focus { + color: #f85149; + background: var(--color-button); + border-color: var(--color-light-border); +} +.ui.basic.red.buttons .button:hover, +.ui.basic.red.button:hover { + color: #ffffff; + background: #b62324; + border-color: #f0f6fc1a; +} +.ui.basic.red.buttons .button:active, +.ui.basic.red.button:active { + color: #ffffff; + background: #d03533; + border-color: #f0f6fc1a; } .issue.list { @@ -158,92 +239,74 @@ a, background-color: #22272e; border-radius: 6px; padding: 3px 10px 3px 10px; - border: 1px solid #373e47; + border: 1px solid var(--color-secondary); } -.ui.menu .item { - background-color: #22272e; +.issue-state-label { + border-radius: 2em !important; } -.ui.horizontal.segments > .segment { - background-color: #22272e; - border-radius: 6px; +.issue-content-right { + border: 0 !important; + padding: 8px 0 0 8px !important; +} + +.issue-content-right .ui.button, +.issue-content-right .ui.input, +.issue-content-right .ui.input input, +.issue-content-right .ui.dropdown input, +.issue-content-right .ui.search.selection.dropdown, +.issue-content-right .ui.search.selection.dropdown > input.search { + padding: 0 8px !important; + min-height: 28px; +} +.issue-content-right .ui.button ~ .ui.button, +.issue-content-right > form ~ .ui.button { + margin-top: .5rem !important; +} + +.ui.top.attached.header { + border-radius: var(--border-radius) var(--border-radius) 0 0; +} +.ui.top.attached.header + .ui.attached.segment:not(.grid):not(.repos-search):not(.teams) { + border-radius: 0 0 var(--border-radius) var(--border-radius); } .ui.attached.header { border-radius: 6px; } -.repository.file.list .repo-description { - color: #adbac7; -} - -.commit-summary a.default-link { - color: #adbac7 !important; -} - -.markup h1, -.markup h2, -.markup h3, -.markup h4, -.markup h5, -.markup h6 { - color: #adbac7; +.ui.attached.table { + background-color: var(--color-body); } +.markup, .markup code, -.markup tt { - color: #adbac7; -} - -.markup p, -.markup blockquote, -.markup details, -.markup ul, -.markup ol, -.markup dl, -.markup table, -.markup pre { - color: #adbac7; +.markup tt, +#org-info a, +.repo-description, +.repository-menu .item { + color: var(--color-white); } .repo-list-link { color: var(--color-blue) !important; } -.ui.menu.two.item .item { - border: 1px solid #373e47; - background: #161b22; +.ui.label:not(.basic) { + border-radius: 2em; } -a, -.push.news { - color: null; -} - -.ui.header { - color: #a6aab5; -} - -.repo-description { - color: #a6aab5 !important; -} - -a.ui.label { - color: #adbac7 !important; +.ui.label.sha { + color: var(--color-text); + background: unset !important; border-color: var(--color-secondary) !important; + border-radius: 0.375rem; } -.ui.label { - border-color: var(--color-secondary) !important; -} - -.ui.menu .item { - color: #adbac7; -} - -.ui .sha.label { - padding: 6px 10px 6px; +.ui.labels a.label:hover, +a.ui.label:hover { + color: var(--color-white); } /* repo list dashboard */ @@ -251,51 +314,98 @@ a.ui.label { background-color: #22272e; } -/* ssh and search repository fields */ -input, -textarea, -.ui.input > input, -.ui.form input:not([type]), -.ui.form select, -.ui.form textarea, -.ui.form input[type="date"], -.ui.form input[type="datetime-local"], -.ui.form input[type="email"], -.ui.form input[type="file"], -.ui.form input[type="number"], -.ui.form input[type="password"], -.ui.form input[type="search"], -.ui.form input[type="tel"], -.ui.form input[type="text"], -.ui.form input[type="time"], -.ui.form input[type="url"], -.ui.selection.dropdown, -.ui.checkbox label:before, -.ui.checkbox input:checked ~ label:before, -.ui.checkbox input:not([type="radio"]):indeterminate ~ label:before { - border-color: #373e47 !important; -} - -/* hover repository rows */ -.repository.file.list #repo-files-table tr:hover { - background-color: var(--color-hover); -} - /* due date boxes */ .repository .metas #deadlineForm input { border-color: var(--color-secondary); } -/* border color dependencies block in issues */ -#new-dependency-drop-list.ui.selection.dropdown { - border-color: var(--color-secondary); +/* default border radius */ +.ui.button, +.ui.basic.buttons .button, +.ui.basic.button, +.ui.dropdown .menu, +.ui.form input:not([type]), +.ui.form input[type="date"], +.ui.form input[type="datetime-local"], +.ui.form input[type="email"], +.ui.form input[type="number"], +.ui.form input[type="password"], +.ui.form input[type="search"], +.ui.form input[type="tel"], +.ui.form input[type="time"], +.ui.form input[type="text"], +.ui.form input[type="file"], +.ui.form input[type="url"], +.ui.form textarea, +.ui.input textarea, +.ui.label, +.ui.menu, +.ui.segment, +.ui.segments, +.ui.segments:not(.horizontal) > .segment:only-child, +.ui.secondary.menu .dropdown.item>.menu, +.ui.selection.dropdown, +.ui.selection.dropdown .menu, +.ui.table, +.ui.text.menu .dropdown.item>.menu { + border-radius: var(--border-radius); } -.page-content .ui.button { - border-color: var(--color-secondary); +.ui.floating.dropdown>.menu { + border-radius: var(--border-radius) !important; } -/* border color form fields settings page */ +/* no border radius between connected buttons */ +.ui.buttons .button { + border-radius: 0; +} + +/* default left border radius */ +.ui.action.input > .dropdown:first-child, +.ui.action.input > .button:first-child, +.ui.action.input > .buttons:first-child > .button, +.ui.compact.menu:not(.secondary) .item:first-child, +.ui.horizontal.segments > .segment:first-child { + border-radius: var(--border-radius) 0 0 var(--border-radius); +} + +/* default right border radius */ +.ui.action.input > .dropdown:last-child, +.ui.action.input > .button:last-child, +.ui.action.input > .buttons:last-child > .button, +.ui.compact.menu:not(.secondary) .item:last-child, +.ui.horizontal.segments > .segment:last-child { + border-radius: 0 var(--border-radius) var(--border-radius) 0; +} + +/* default top border radius */ +.ui.secondary.pointing.menu .active.item, +.ui.secondary.pointing.menu .item:hover { + border-radius: var(--border-radius) var(--border-radius) 0 0; +} +.ui.tabular.menu .active.item, +.repository.view.issue .comment-list .comment > .content > div:first-child { + border-top-left-radius: var(--border-radius) !important; + border-top-right-radius: var(--border-radius) !important; +} + +/* default bottom border radius */ +.ui.segment[class*="bottom attached"] { + border-radius: 0 0 var(--border-radius) var(--border-radius); +} +.repository.view.issue .comment-list .comment > .content > div:last-child { + border-bottom-right-radius: var(--border-radius); + border-bottom-left-radius: var(--border-radius); +} + +.ui.table>thead>tr:first-child>th:first-child { + border-radius: var(--border-radius) 0 0; +} +.ui.table>thead>tr:first-child>th:last-child { + border-radius: 0 var(--border-radius) 0 0; +} + +/* border color form fields */ input, textarea, .ui.input > input, @@ -320,20 +430,8 @@ textarea, border-color: var(--color-secondary); } -/* background color of code display */ -.lines-code { - background-color: #22272e; -} - -.code-diff-unified .add-code, -.code-diff-unified .add-code td, -.code-diff-split .add-code .lines-num-new, -.code-diff-split .add-code .lines-type-marker-new, -.code-diff-split .add-code .lines-code-new, -.code-diff-split .del-code .add-code.lines-num-new, -.code-diff-split .del-code .add-code.lines-type-marker-new, -.code-diff-split .del-code .add-code.lines-code-new { - background: rgba(70, 149, 74, 0.15); +.ui.input > input { + transition: none; } .tag-code, @@ -341,21 +439,39 @@ textarea, background-color: var(--color-body); } -/* green code color dark theme */ +/* code highlighting dark theme */ +.chroma .cm, /* block comments */ +.chroma .c1 /* line comments */ { + color: #8b949e; +} + +/* strings */ +.chroma .s, +.chroma .cpf { + color: #a5d6ff; +} + .chroma .s2 { color: #8ddb8c; } -.chroma .k { - color: #f47067; +/* keywords */ +.chroma .k, +.chroma .kc, +.chroma .kd, +.chroma .kn, +.chroma .kt { + color: #ff7b72; } .chroma .m { color: #6cb6ff; } +/* method names */ +.chroma .na, .chroma .nf { - color: #96d0ff; + color: #d2a8ff; } .chroma .nb { @@ -382,159 +498,163 @@ textarea, color: #c4cfcf; } +.chroma .n, /* variable & referenced class names */ +.chroma .nc, /* class names */ +.chroma .nn /* import names */ { + color: #c9d1d9; +} + +/* operators */ .chroma .o { - color: #eb3243; + color: #c9d1d9; } -.chroma .nc { - color: #16e9e9; +.repository.file.list #repo-files-table thead tr th { + padding: 12px 12px 12px 20px; } -.chroma .nn { - color: #16e9e9; +.repository.file.list #repo-files-table tbody tr { + background: var(--color-body); } -.chroma .s { - color: #8ddb8c; -} - -/* border color repo files */ -.repository.file.list #repo-files-table td { - // border-bottom: 1px solid #373e47; +.repository.file.list #repo-files-table tbody tr:hover { + background: var(--color-box-header); } /* text color repo files */ -.repository.file.list #repo-files-table td { - color: var(--color-text-light) !important; - background: #161b22; +.repository.file.list #repo-files-table td.name a, +.repository.file.list #repo-files-table td a:not(.muted) { + color: var(--color-white); } -.repository.file.list #repo-files-table td a { - /* color: #7f8699 !important; */ - color: var(--color-blue) !important; +.repository.file.list #repo-files-table td a:hover { + color: var(--color-blue); +} + +.repository #commits-table.ui.basic.striped.table tbody tr:nth-child(2n) { + background-color: var(--color-body) !important; +} + +.repository #commits-table .author a { + color: var(--color-text); } /* gpg commit label */ .repository #commits-table td.sha .sha.label.isSigned.isVerified, .repository #repo-files-table .sha.label.isSigned.isVerified, .repository #rev-list .sha.label.isSigned.isVerified, -.repository - .timeline-item.commits-list - .singular-commit - .sha.label.isSigned.isVerified { +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified { border: 1.5px solid #21ba45 !important; background: transparent; border-radius: 6px; } -/* color of active tabular item, e.g. in PR view (conversations, commits, files changed) */ -.ui.tabular.menu .active.item, -.ui.tabular.menu .active.item:hover { - background: var(--color-navbar); - border-bottom: 3px solid #f78166 !important; - border: 0px solid black; - color: #adbac7; +.ui.container .ui.tabular.menu .active.item, +.ui.container .ui.tabular.menu .active.item:hover { + color: var(--color-white); + margin-top: 0; +} + +.header-wrapper .ui.tabular.menu, +.ui.secondary.menu:not(.filter) { + gap: 0.5rem; +} +.header-wrapper .ui.tabular.menu { + min-height: 48px; + align-items: center; +} +.header-wrapper .ui.menu .item, +.page-content > .ui.menu .item { + color: var(--color-white) !important; +} +.page-content .ui.menu .item .svg { + margin-right: 0.5rem !important; +} +.header-wrapper .ui.tabular.menu:not(.new-menu) .item, +.header-wrapper .ui.tabular.menu:not(.new-menu) .active.item, +.ui.secondary.menu:not(.new-menu) .item +.ui.secondary.menu:not(.new-menu) .active.item { + border: 0; + border-radius: var(--border-radius) !important; + align-items: center; + line-height: 30px; + padding: 0 8px; + margin-top: 0 !important; + margin-bottom: 0 !important; +} +.header-wrapper .ui.tabular.menu .item:hover, +.ui.secondary.menu .item:hover { + background: var(--color-nav-hover-bg) !important; +} +.header-wrapper .ui.tabular.menu:not(.new-menu) .active.item { + background: unset; +} +.header-wrapper .ui.tabular.menu:not(.new-menu) .active.item::after { + background: #f78166; + bottom: calc(50% - 25px); + content: ""; + height: 2px; + position: absolute; + right: 50%; + transform: translate(50%, -50%); + width: 100%; + z-index: 1; +} +.ui.secondary.pointing.menu .active.item, +.ui.secondary.pointing.menu .active.item:hover { + border-color: #f78166; +} +.ui.menu.new-menu .item:last-child { + padding-right: 16px !important; +} + +.ui.basic.label { + color: var(--color-text-light-1); + border-radius: 2em; + background: transparent; + font-weight: 400; + padding: 0 7px !important; + line-height: 18px; +} +.ui.menu .item > .label:not(.floating) { + padding: 4px 7px; } /* repo watch and fork counters */ -.ui.basic.labels:not(.tag):not(.image):not(.ribbon) .label, -.ui.basic.label:not(.tag):not(.image):not(.ribbon) { - color: #adbac7; +.repo-buttons .ui.labeled.button>.label, +.repo-buttons .ui.labeled.button>.label:hover { + color: var(--color-white); + border-top-right-radius: var(--border-radius); + border-bottom-right-radius: var(--border-radius); + background: #21262d; + padding: 0 10px !important; } .repo-buttons .ui.labeled.button.disabled > .label { color: #adbac7; } -/* border color of warning message */ -.ui.warning.message { - background-color: #22272e; - color: var(--color-text); -} - -.ui.warning.message, -.ui.attached.warning.message { - box-shadow: null; -} - -.ui.warning.message, -.ui.attached.warning.message { - box-shadow: 0 0 0 0px #c9ba9b inset, 0 0 #0000; -} - -/* repo svg icons */ -.repository.view.issue .comment-list .timeline-item .badge .svg { - fill: #cdd9e5fff !important; -} - /* background emoji reactions */ .repository .segment.reactions .ui.label.basic.blue { background-color: transparent; } -.ui.positive.message { - background-color: #22272e; - color: #cdd9e5; +.diff-toggle-file-tree-button:hover { + color: var(--color-blue); } -.ui.positive.message, -.ui.attached.positive.message { - box-shadow: 0 0 0 1px #347d39 inset, 0 0 #0000; -} - -/* diff color deletion */ -.code-diff-unified .del-code, -.code-diff-unified .del-code td, -.code-diff-split .del-code .lines-num-old, -.code-diff-split .del-code .lines-type-marker-old, -.code-diff-split .del-code .lines-code-old { - background: rgba(229, 83, 75, 0.15); -} - -/* diff color neutral */ -.lines-num, -.lines-code { - background-color: var(--color-navbar); -} - -.lines-type-marker { - background-color: var(--color-navbar); +.diff-file-body .file-body.code-diff table tbody tr td { + line-height: 16px; } a.blob-excerpt { background: var(--color-body); } -/* PR open label */ -.ui.green.labels .label, -.ui.ui.ui.green.label { - background-color: #347d39; -} - -/* bg color of PR comment form */ -.ui.form, -.ui.form .field .dropdown, -.ui.form .field .dropdown .menu > .item { - background-color: var(--color-navbar); -} - .comment-code-cloud { background-color: var(--color-navbar); } -/* remove border of "new file" button */ -.ui.buttons .button:first-child { - border-left: 1px solid var(--color-markup-code-block); -} - -/* border color of dropdown svg */ -.ui.form, -.ui.form .field .dropdown, -.ui.form .field .dropdown .menu > .item { - background-color: var(--color-border); - /* border: 0px solid black !important; */ -} - /* hover font color */ .ui.secondary.pointing.menu .active.item, .ui.secondary.pointing.menu .active.item:hover, @@ -548,35 +668,26 @@ a.blob-excerpt { .ui.selection.active.dropdown:hover, .ui.selection.active.dropdown .menu, .ui.selection.active.dropdown:hover .menu { - border-color: #373e47; + border-color: var(--color-secondary); } -/* user avatar background */ -.user.profile .ui.card #profile-avatar { - background: var(--color-navbar); -} -.ui.cards > .card > .content, -.ui.card > .content { - background: var(--color-navbar); +.ui.cards > .card, +.ui.card, +.ui.cards a.card:hover, +a.ui.card:hover { + border: 0; } - -.user.profile .ui.card .extra.content ul li:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); - background-color: var(--color-navbar); +.ui.cards > .card > .extra, .ui.card > .extra { + border-top-color: var(--color-secondary) !important; } - -.user.profile .ui.card .extra.content ul li { - background-color: var(--color-navbar); -} - -/* right border of profile search bar */ -.ui.action.input:not([class*="left action"]) > input { - border-right-color: var(--color-secondary); +.ui.cards > .card > .extra a:not(.ui):hover, +.ui.card > .extra a:not(.ui):hover { + color: var(--color-blue); } .ui.action.input:not([class*="left action"]) > input:focus { - border-right-color: var(--color-secondary); + border-right: none; } /* font color line numbers */ @@ -613,52 +724,41 @@ a.blob-excerpt { border-bottom: 0px solid #a3c293; } -/* info message banner colors */ -.ui.info.message { - background-color: var(--color-navbar); - color: var(--color-text); -} - /* PR timelines colors */ -.repository.view.issue .comment-list .timeline-item .badge .svg { - fill: black; -} - .repository.view.issue .comment-list .timeline-item .badge { - background-color: var(--color-navbar); - color: var(--color-text); width: 30px; height: 30px; margin-left: -31px; } -.repository.view.issue .comment-list .timeline-item .badge.badge-commit { - border-color: var(--color-navbar); - background: var(--color-navbar); +.repository.view.issue .pull-desc code { + color: var(--color-text-light-1); } -.repository.view.issue .comment-list .timeline:before { - background-color: #373e47; +.repository.view.issue .pull-desc code a { + background-color: var(--color-label-bg); + padding: 0 4px; + border-radius: var(--border-radius); } -.repository.view.issue .comment-list .timeline-item .badge .svg { - width: 20px; - height: 20px; - padding: 3px; +.ui.top.attached.header.comment-header { + padding: 0 16px; } -input { - caret-color: var(--color-text); +.comment:target .header:before { + border-right-color: var(--color-info-border) !important; + box-shadow: none !important; } - -.removed-code { - background: #b70f22; - color: var(--color-text); +.comment:target .comment-container { + border-color: var(--color-info-border) !important; + box-shadow: none !important; } - -.added-code { - background: #0d8b2c; - color: var(--color-text); +.comment:target .comment-container { + background: var(--color-body); +} +.comment:target .comment-container .comment-header { + background: var(--color-info-bg); + border-bottom-color: var(--color-info-border) !important; } /* review - pending label */ @@ -677,44 +777,18 @@ i.green.icon.icon.icon.icon { color: var(--color-primary); } -span.green .svg { - color: var(--color-primary); -} - -/* highlight color bg for highlighted lines */ -.lines-code.active, -.lines-code .active { - border-radius: 6px; - background: #000000 !important; -} - -.ui.ui.ui.ui.table tr.active, -.ui.ui.table td.active { - box-shadow: 0 0 #000000de inset; - background: #e0e0e0; - color: --var(--color-text); -} - -/* navbar font size */ -.ui.secondary.menu .item { - font-size: 13px; -} - -#navbar .item { - margin: 0; - padding: 0.5em; - font-size: 14px; -} - .following.bar #navbar { width: 100vw; - border-bottom: 1px solid #373e47; + border-bottom: 1px solid var(--color-secondary); /* default 52px */ min-height: 40px; padding: 0 0.5rem; background: var(--color-navbar); } +* { + scrollbar-color: unset; +} ::-webkit-scrollbar-thumb { box-shadow: inset 0 0 0 6px var(--color-navbar); } @@ -726,37 +800,19 @@ span.green .svg { margin-top: -2px; } -/* border colors of search fields, e.g. "find repository" on main page */ -input:hover, -textarea:hover, -.ui.input input:hover, -.ui.form input:not([type]):hover, -.ui.form select:hover, -.ui.form textarea:hover, -.ui.form input[type="date"]:hover, -.ui.form input[type="datetime-local"]:hover, -.ui.form input[type="email"]:hover, -.ui.form input[type="file"]:hover, -.ui.form input[type="number"]:hover, -.ui.form input[type="password"]:hover, -.ui.form input[type="search"]:hover, -.ui.form input[type="tel"]:hover, -.ui.form input[type="text"]:hover, -.ui.form input[type="time"]:hover, -.ui.form input[type="url"]:hover, -.ui.selection.dropdown:hover, -.ui.checkbox label:hover:before, -.ui.checkbox label:active:before, .ui.radio.checkbox label:after, .ui.radio.checkbox input:focus ~ label:before, .ui.radio.checkbox input:checked ~ label:before { border-color: var(--color-secondary); } -a:hover, -a.muted:hover, -.ui.breadcrumb a:hover { - color: var(--color-blue); +.input > input ~ button, +.input > input ~ .button { + border-left-width: 0 !important; +} +.input > input:focus ~ button, +.input > input:focus ~ .button { + border-color: var(--color-blue) !important; } input:focus, @@ -776,46 +832,31 @@ textarea:focus, .ui.form input[type="text"]:focus, .ui.form input[type="time"]:focus, .ui.form input[type="url"]:focus, -.ui.selection.dropdown:focus, +.ui.selection.dropdown:focus { + border-color: var(--color-blue); + border-radius: var(--border-radius); +} + .ui.checkbox input:focus ~ label:before, +.ui.checkbox input:focus ~ label::before, .ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label:before, +.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label::before, .ui.checkbox input:checked:focus ~ label:before, -.ui.radio.checkbox input:focus:checked ~ label:before { - border-color: ; +.ui.checkbox input:checked:focus ~ label::before, +.ui.radio.checkbox input:focus:checked ~ label:before, +.ui.radio.checkbox input:focus:checked ~ label::before { + border-color: var(--color-blue); } .repo-icon { display: none; } -/* reduce navbar bottom margin */ -.ui.ui.ui.container:not(.fluid) { - margin-bottom: -3px; -} - .ui.green.button { padding: 5px 16px; line-height: 20px; } -.ui.green.labels .label, -.ui.ui.ui.green.label { - padding: 2px 5px; - line-height: 20px; - color: #cdd9e5 !important; - border-radius: 2em; -} - -.ui.tabular.menu .active.item { - margin-bottom: 1px; -} - -/* repository icon for directories */ -.repository.file.list #repo-files-table tbody .svg.octicon-file-directory-fill, -.repository.file.list #repo-files-table tbody .svg.octicon-file-submodule { - color: #768390; -} - .ui.secondary.pointing.menu .item > .circular.label { line-height: 10px; } @@ -827,151 +868,83 @@ textarea:focus, .ui.primary.label, .ui.primary.labels .label { - background-color: #373e47 !important; -} - -// timeline view icon color -.repository.view.issue .comment-list .timeline-item .badge .svg { - fill: #cdd9e5 !important; + background-color: var(--color-secondary) !important; } /* borders -------------------------------------------------------------------*/ -// border width of active item in repo view -.ui.tabular.menu .active.item, -.ui.tabular.menu .active.item:hover { - border-width: initial; -} - -// README border -.ui.attached:not(.message) + .ui.attached.segment:not(.top) { - border-width: inherit; -} - -.ui.top.attached.header { - border-width: inherit; - border: 1px solid #373e47; -} - .following.bar.light { border-bottom: 0px solid var(--color-secondary); } -.ui.action.input:not([class*="left action"]) > input { - border-width: inherit; -} - -.ui.action.input > .dropdown:last-child, -.ui.action.input > .button:last-child, -.ui.action.input > .buttons:last-child > .button { - border-width: inherit; -} - -.ui.action.input:not([class*="left action"]) - > .ui.dropdown.selection:not(:focus):not(:hover) { - border-width: inherit; -} - -.repository #clone-panel #repo-clone-https, -.repository #clone-panel #repo-clone-ssh { - border-width: inherit; -} - -.ui.action.input > .dropdown:not(:first-child), -.ui.action.input > .button:not(:first-child), -.ui.action.input > .buttons:not(:first-child) > .button { - border-width: inherit; -} - -.ui.segment, -.ui.segments, -.ui.attached.segment { - border-width: inherit; -} - .ui.table { border-width: inherit; } -footer { - border-width: inherit; -} - -.page-content .ui.button { - border-width: inherit; -} - .repo-buttons .ui.labeled.button > .label { border-width: inherit; - border: 1px solid #373e47 !important; + border: 1px solid var(--color-secondary) !important; } .repo-button-row .button { - height: unset; -} - -.repository .repository-summary .segment.language-stats { - height: 14px; - border-radius: 6px; + min-height: 30px; } .ui.table[class*="single line"], .ui.table [class*="single line"] { white-space: nowrap; - border: 1px solid #373e47; + border: 1px solid var(--color-secondary); } -.ui.tiny.input { - font-size: 0.85714286em; - border: 1px solid #373e47; - border-radius: 6px; -} - -.ui.fluid.input { - border: 1px solid #373e47 !important; - border-radius: 6px; -} - -.repository.view.issue .comment-list .comment > .content > div:last-child { - border: 0px solid #373e47 !important; -} .ui.basic.secondary.buttons .button, .ui.basic.secondary.button { color: var(--color-text) !important; - border: 1px solid #373e47 !important; -} -.ui.small.buttons .dropdown, -.ui.small.buttons .dropdown .menu > .item, -.ui.small.buttons .button, -.ui.small.buttons .or, -.ui.ui.ui.ui.small.button { - border: 1px solid #373e47 !important; + border: 1px solid var(--color-secondary) !important; } .ui.table > tr > td, .ui.table > tbody > tr > td { - border-top-color: #373e47; + border-top-color: var(--color-secondary); } -.ui.basic.primary.button, -.ui.basic.primary.buttons .button { - color: #adbac7 !important; - font-weight: 500 !important; +.ui.labeled.button.disabled>.button, +.ui.basic.buttons .button, +.ui.basic.button, +.ui.basic.buttons .button:focus, +.ui.basic.button:focus { + color: var(--color-text); } -.feeds .list ul li .repo-list-link { - background: #161b22; +.ui.vertical.menu { + background: var(--color-body); + border: 0; } -.ui.attached:not(.message) + .ui.attached.segment:not(.top) { - border: 1px solid #373e47; +.ui.vertical.menu .header.item { + font-weight: 600; + background: unset; +} +.ui.vertical.menu .menu .item:hover { +background: var(--color-hover); } -.ui.menu .active.item, -.ui.menu .active.item:hover, .ui.vertical.menu .active.item, .ui.vertical.menu .active.item:hover { - background: #161b22; + background: #b1bac414 !important; font-weight: 500; - color: #adbac7; +} +.ui.vertical.menu .item, +.ui.vertical.menu .item > summary { + background: unset; + padding: 8px; + color: var(--color-white) !important; +} +.ui.vertical.menu .item, +.ui.vertical.menu .item.active, +.ui.vertical.menu .item:hover, +.ui.vertical.menu .item > summary { + border-radius: 6px; +} +.ui.vertical.menu .item::before { + background: unset; } .ui.primary.labels .label, .ui.ui.ui.primary.label { @@ -980,18 +953,6 @@ footer { .issue.list a:not(.label):hover { color: var(--color-blue) !important; } -.ui.segment, -.ui.segments, -.ui.attached.segment { - border: 1px solid #373e47 !important; -} -.repository.view.issue .comment-list .comment .comment-container { - border: 1px solid #373e47; - border-radius: 0px; -} -.repository.view.issue .comment-list .comment > .content > div:first-child { - border-bottom: 1px solid #373e47 !important; -} .tag-code, .tag-code td, .tag-code .blob-excerpt { @@ -1004,15 +965,6 @@ footer { color: #cdd9e5; } -.ui.basic.red.buttons .button, -.ui.basic.red.button { - color: var(--color-red); - border: 1px solid var(--color-red); - border-radius: 16px; - padding: 5px 16px; - line-height: 20px; -} - #navbar a.item .notification_count { color: var(--color-text); } @@ -1024,11 +976,11 @@ footer { .ui.secondary.menu .active.item, .ui.secondary.menu .active.item:hover { - color: #e3e3e3; - background-color: var(--color-nav-bg); + color: var(--color-white) !important; } -// list in Pull requests view -.issue.list > .item .desc { - color: var(--color-text); -} +.vch__day__square, +.vch__legend__wrapper rect { + rx: 2px; + ry: 2px; +} \ No newline at end of file diff --git a/charts/kubezero-ci/update.sh b/charts/kubezero-ci/update.sh index 2215b555..da700b58 100755 --- a/charts/kubezero-ci/update.sh +++ b/charts/kubezero-ci/update.sh @@ -10,4 +10,7 @@ update_helm ../kubezero-metrics/sync_grafana_dashboards.py dashboard-jenkins.yaml templates/jenkins/grafana-dashboard.yaml ../kubezero-metrics/sync_grafana_dashboards.py dashboard-gitea.yaml templates/gitea/grafana-dashboard.yaml +#Gitea dark theme +# https://codeberg.org/pat-s/gitea-github-theme +# update_docs diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index e94926f3..f9b4593b 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -2,7 +2,7 @@ gitea: enabled: false image: - tag: 1.21.11 + # tag: 1.21.11 rootless: true repliaCount: 1 @@ -67,8 +67,8 @@ gitea: queue: TYPE: level ui: - THEMES: "gitea,github-dark" - DEFAULT_THEME: "github-dark" + THEMES: "gitea-light,gitea-dark,github-dark" + DEFAULT_THEME: "gitea-dark" log: LEVEL: warn @@ -210,6 +210,7 @@ jenkins: # - name: AWS_ROLE_ARN # value: "" yamlMergeStrategy: "merge" + inheritYamlMergeStrategy: true yamlTemplate: |- apiVersion: v1 kind: Pod