diff options
| author | Giteabot <teabot@gitea.io> | 2023-07-25 07:43:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-25 11:43:39 +0000 |
| commit | 3b518a3af5541c90582deba7bee8fba13d39e1ed (patch) | |
| tree | d28e1d589f26096edf4cdce73536be6816d1e82a | |
| parent | 08cdc0da3d6a649892a3687635640d02e3cd9fcf (diff) | |
| download | gitea-3b518a3af5541c90582deba7bee8fba13d39e1ed.tar.gz gitea-3b518a3af5541c90582deba7bee8fba13d39e1ed.zip | |
Improve commit graph alignment and truncating (#26112) (#26127)
Backport #26112 by @wxiaoguang
Fix #26101
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
| -rw-r--r-- | templates/repo/graph/commits.tmpl | 18 | ||||
| -rw-r--r-- | web_src/css/features/gitgraph.css | 7 |
2 files changed, 15 insertions, 10 deletions
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index f5fc27315a..8652a72052 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -31,27 +31,27 @@ <span class="message gt-dib gt-ellipsis gt-mr-3"> <span>{{RenderCommitMessage $.Context $commit.Subject $.RepoLink $.Repository.ComposeMetas}}</span> </span> - <span class="tags gt-df gt-ac gt-mr-2"> + <span class="commit-refs gt-df gt-ac gt-mr-2"> {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} {{if or (not $.HidePRRefs) (SliceUtils.Contains $.SelectedBranches .Name)}} <!-- it's intended to use issues not pulls, if it's a pull you will get redirected --> - <a class="ui labelled icon button basic tiny gt-mr-2" href="{{$.RepoLink}}/{{if $.Repository.UnitEnabled $.Context $.UnitTypePullRequests}}pulls{{else}}issues{{end}}/{{.ShortName|PathEscape}}"> - {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}#{{.ShortName}} + <a class="ui labelled basic tiny button" href="{{$.RepoLink}}/{{if $.Repository.UnitEnabled $.Context $.UnitTypePullRequests}}pulls{{else}}issues{{end}}/{{.ShortName|PathEscape}}"> + {{svg "octicon-git-pull-request"}} #{{.ShortName}} </a> {{end}} {{else if eq $refGroup "tags"}} - <a class="ui labelled icon button basic tiny gt-mr-2" href="{{$.RepoLink}}/src/tag/{{.ShortName|PathEscape}}"> - {{svg "octicon-tag" 16 "gt-mr-2"}}{{.ShortName}} + <a class="ui labelled basic tiny button" href="{{$.RepoLink}}/src/tag/{{.ShortName|PathEscape}}"> + {{svg "octicon-tag"}} {{.ShortName}} </a> {{else if eq $refGroup "remotes"}} - <a class="ui labelled icon button basic tiny gt-mr-2" href="{{$.RepoLink}}/src/commit/{{$commit.Rev|PathEscape}}"> - {{svg "octicon-cross-reference" 16 "gt-mr-2"}}{{.ShortName}} + <a class="ui labelled basic tiny button" href="{{$.RepoLink}}/src/commit/{{$commit.Rev|PathEscape}}"> + {{svg "octicon-cross-reference"}} {{.ShortName}} </a> {{else if eq $refGroup "heads"}} - <a class="ui labelled icon button basic tiny gt-mr-2" href="{{$.RepoLink}}/src/branch/{{.ShortName|PathEscape}}"> - {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.ShortName}} + <a class="ui labelled basic tiny button" href="{{$.RepoLink}}/src/branch/{{.ShortName|PathEscape}}"> + {{svg "octicon-git-branch"}} {{.ShortName}} </a> {{else}} <!-- Unknown ref type .Name --> diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css index 0ca611d641..a49e930948 100644 --- a/web_src/css/features/gitgraph.css +++ b/web_src/css/features/gitgraph.css @@ -109,8 +109,13 @@ background-color: var(--color-secondary-alpha-30); } -#git-graph-container #rev-list .tags a.button { +#git-graph-container #rev-list .commit-refs .button { padding: 2px 4px; + margin-right: 0.25em; + display: inline-block; + max-width: 200px; + overflow: hidden; + text-overflow: ellipsis; } #git-graph-container #rev-list .sha.label { |