diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index b9b42ebb235d..b9d0e617134e 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -41,28 +41,18 @@
{{$class = (printf "%s%s" $class " isWarning")}}
{{end}}
{{end}}
+ {{$commitShaLink := ""}}
{{if $.PageIsWiki}}
-
+ {{$commitShaLink = (printf "%s/wiki/commit/%s" $commitRepoLink (PathEscape .ID.String))}}
{{else if $.PageIsPullCommits}}
-
+ {{$commitShaLink = (printf "%s/pulls/%d/commits/%s" $commitRepoLink $.Issue.Index (PathEscape .ID.String))}}
{{else if $.Reponame}}
-
- {{else}}
-
+ {{$commitShaLink = (printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String))}}
{{end}}
+
{{ShortSha .ID.String}}
- {{if .Signature}}
- {{template "repo/shabox_badge" dict "root" $ "verification" .Verification}}
- {{end}}
- {{if $.PageIsWiki}}
-
- {{else if $.PageIsPullCommits}}
-
- {{else if $.Reponame}}
-
- {{else}}
-
- {{end}}
+ {{if .Signature}}{{template "repo/shabox_badge" dict "root" $ "verification" .Verification}}{{end}}
+
@@ -78,7 +68,7 @@
{{end}}
{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}}
{{if IsMultilineCommitMessage .Message}}
- {{RenderCommitBody $.Context .Message $commitRepoLink $.Repository.ComposeMetas}}
+ {{RenderCommitBody $.Context .Message $commitRepoLink $.Repository.ComposeMetas}}
{{end}}
|
{{if .Committer}}
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl
index 0a21aec9c082..58ede56579d3 100644
--- a/templates/repo/graph/commits.tmpl
+++ b/templates/repo/graph/commits.tmpl
@@ -24,7 +24,7 @@
{{ShortSha $commit.Commit.ID.String}}
{{- if $commit.Commit.Signature -}}
- {{template "repo/shabox_badge" dict "root" $ "verification" $commit.Verification}}
+ {{template "repo/shabox_badge" dict "root" $ "verification" $commit.Verification}}
{{- end -}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 453c06216d9a..7be2455779a4 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -6,7 +6,7 @@
…
{{else}}
{{if .LatestCommitUser}}
- {{ctx.AvatarUtils.Avatar .LatestCommitUser 24}}
+ {{ctx.AvatarUtils.Avatar .LatestCommitUser 24 "gt-mr-2"}}
{{if .LatestCommitUser.FullName}}
{{.LatestCommitUser.FullName}}
{{else}}
@@ -14,7 +14,7 @@
{{end}}
{{else}}
{{if .LatestCommit.Author}}
- {{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
+ {{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24 "gt-mr-2"}}
{{.LatestCommit.Author.Name}}
{{end}}
{{end}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 53c6f7820699..9d7c12525e0d 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1308,9 +1308,13 @@ img.ui.avatar,
.ui .sha.label {
font-family: var(--fonts-monospace);
font-size: 13px;
- padding: 6px 10px 4px;
font-weight: var(--font-weight-normal);
margin: 0 6px;
+ padding: 5px 10px;
+}
+
+.ui .sha.label .shortsha {
+ display: inline-block; /* not sure whether it is still needed */
}
.ui .button.copy-commit-sha {
diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css
index a49e93094842..795e1f2d61fb 100644
--- a/web_src/css/features/gitgraph.css
+++ b/web_src/css/features/gitgraph.css
@@ -123,14 +123,6 @@
padding-bottom: 3px;
}
-#git-graph-container #rev-list .sha.label .shortsha {
- padding-top: 0;
-}
-
-#git-graph-container #rev-list .sha.label .shortsha-pad {
- padding-right: 10px;
-}
-
#git-graph-container #rev-list .sha.label .ui.detail.icon.button {
padding-top: 3px;
margin-top: -5px;
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 94745ff4f51e..cbf9fac76bab 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -245,15 +245,9 @@
}
.repository.file.list #repo-files-table thead th {
- padding-top: 8px;
- padding-bottom: 5px;
font-weight: var(--font-weight-normal);
}
-.repository.file.list #repo-files-table thead .ui.avatar {
- margin-bottom: 5px;
-}
-
.repository.file.list #repo-files-table tbody .svg {
margin-left: 3px;
margin-right: 5px;
@@ -891,11 +885,6 @@
background: var(--color-red-badge-bg);
}
-.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isWarning .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isWarning:hover {
background: var(--color-red-badge-hover-bg) !important;
}
@@ -905,11 +894,6 @@
background: var(--color-green-badge-bg);
}
-.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerified .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerified:hover {
background: var(--color-green-badge-hover-bg) !important;
}
@@ -919,11 +903,6 @@
background: var(--color-yellow-badge-bg);
}
-.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted:hover {
background: var(--color-yellow-badge-hover-bg) !important;
}
@@ -933,11 +912,6 @@
background: var(--color-orange-badge-bg);
}
-.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched:hover {
background: var(--color-orange-badge-hover-bg) !important;
}
@@ -1387,14 +1361,6 @@
background: var(--color-red-badge-bg);
}
-.repository #commits-table td.sha .sha.label.isSigned.isWarning .shortsha,
-.repository #repo-files-table .sha.label.isSigned.isWarning .shortsha,
-.repository #rev-list .sha.label.isSigned.isWarning .shortsha,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository #commits-table td.sha .sha.label.isSigned.isWarning .detail.icon,
.repository #repo-files-table .sha.label.isSigned.isWarning .detail.icon,
.repository #rev-list .sha.label.isSigned.isWarning .detail.icon,
@@ -1418,14 +1384,6 @@
background: var(--color-green-badge-bg);
}
-.repository #commits-table td.sha .sha.label.isSigned.isVerified .shortsha,
-.repository #repo-files-table .sha.label.isSigned.isVerified .shortsha,
-.repository #rev-list .sha.label.isSigned.isVerified .shortsha,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository #commits-table td.sha .sha.label.isSigned.isVerified .detail.icon,
.repository #repo-files-table .sha.label.isSigned.isVerified .detail.icon,
.repository #rev-list .sha.label.isSigned.isVerified .detail.icon,
@@ -1449,14 +1407,6 @@
background: var(--color-yellow-badge-bg);
}
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted .shortsha,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted .shortsha,
-.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted .shortsha,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
@@ -1480,14 +1430,6 @@
background: var(--color-orange-badge-bg);
}
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched .shortsha,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched .shortsha,
-.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched .shortsha,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched .shortsha {
- display: inline-block;
- padding-top: 1px;
-}
-
.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
@@ -2691,11 +2633,6 @@ tbody.commit-list {
line-height: initial;
}
-/* commit history list */
-.repository:not(.diff) .commit-body {
- margin: 0;
-}
-
/* PR-comment */
.repository:not(.diff) .timeline-item .commit-body {
margin-left: 40px;