Skip to content

Do not show unnecessary commit sign lock icon #33387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion templates/repo/commit_sign_badge.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ so this template should be kept as small as possbile, DO NOT put large component
{{- else -}}
{{- if $verification.Warning -}}
{{- $extraClass = print $extraClass " sign-warning" -}}
{{- else -}}
{{- $extraClass = "" -}}{{/* the commit is not signed */}}
{{- end -}}
{{- $msgReason = ctx.Locale.Tr $verification.Reason -}}{{- /* dirty part: it is the translation key ..... */ -}}
{{- end -}}
Expand All @@ -57,6 +59,7 @@ so this template should be kept as small as possbile, DO NOT put large component
<a {{if $commitBaseLink}}href="{{$commitBaseLink}}/{{$commit.ID}}"{{end}} class="ui label commit-id-short {{$extraClass}}" rel="nofollow">
{{- ShortSha $commit.ID.String -}}
{{- end -}}
{{- if or (not $commit) $extraClass}}{{/* only show the lock icon if there is no commit info (icon only) or the commit is really signed */}}
<span class="ui label commit-sign-badge {{$extraClass}}">
{{- if $verified -}}
{{- if and $signingUser $signingUser.ID -}}
Expand All @@ -70,7 +73,7 @@ so this template should be kept as small as possbile, DO NOT put large component
<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-unlock"}}</span>
{{- end -}}
</span>

{{- end -}}
{{- if $commit -}}
</a>
{{- end -}}
Expand Down
3 changes: 2 additions & 1 deletion web_src/css/repo/commit-sign.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@

.ui.label.commit-id-short {
font-family: var(--fonts-monospace);
height: 24px;
}

.ui.label.commit-id-short > .commit-sign-badge {
margin: 0;
padding: 0;
border: 0 !important;
border-radius: 0;
background: transparent;
background: transparent !important;
}

.ui.label.commit-id-short > .commit-sign-badge:hover {
Expand Down
Loading