mirror
/
gitea
mirror of https://github.com/go-gitea/gitea
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix SVG close tag, improve commit graph page UI alignment (#23751)

Browse Source 
Follow #23748

Thanks to @delvh 

----

And, fix the UI alignment by the way (adding some `gt-mr-xx`)

Before:


![image](https://user-images.githubusercontent.com/2114189/228034794-7a6ac8d6-01fa-4dd2-97d4-0df0368f8ee0.png)

After:


![image](https://user-images.githubusercontent.com/2114189/228034938-64edeadf-7c99-4e74-b658-0ca62b72d596.png)
pull/22993/head
wxiaoguang 2 years ago committed by GitHub
parent 31ab331b23
commit dfbefd1a54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      templates/repo/graph/commits.tmpl
  2. 4
      templates/repo/graph/svgcontainer.tmpl

12
templates/repo/graph/commits.tmpl
Unescape View File

@ -28,10 +28,10 @@
{{- end -}} {{- end -}}
</a> </a>
</span> </span>
<span class="message gt-dib gt-ellipsis gt-mr-2"> <span class="message gt-dib gt-ellipsis gt-mr-3">
<span>{{RenderCommitMessage $.Context $commit.Subject $.RepoLink $.Repository.ComposeMetas}}</span> <span>{{RenderCommitMessage $.Context $commit.Subject $.RepoLink $.Repository.ComposeMetas}}</span>
</span> </span>
<span class="tags gt-df gt-ac"> <span class="tags gt-df gt-ac gt-mr-2">
{{range $commit.Refs}} {{range $commit.Refs}}
{{$refGroup := .RefGroup}} {{$refGroup := .RefGroup}}
{{if eq $refGroup "pull"}} {{if eq $refGroup "pull"}}
@ -54,20 +54,20 @@
{{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.ShortName}} {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.ShortName}}
</a> </a>
{{else}} {{else}}
<!-- Unknown ref type {{.Name}} --> <!-- Unknown ref type .Name -->
{{end}} {{end}}
{{end}} {{end}}
</span> </span>
<span class="author gt-df gt-ac gt-mr-2"> <span class="author gt-df gt-ac gt-mr-3">
{{$userName := $commit.Commit.Author.Name}} {{$userName := $commit.Commit.Author.Name}}
{{if $commit.User}} {{if $commit.User}}
{{if $commit.User.FullName}} {{if $commit.User.FullName}}
{{$userName = $commit.User.FullName}} {{$userName = $commit.User.FullName}}
{{end}} {{end}}
{{avatar $.Context $commit.User}} <span class="gt-mr-2">{{avatar $.Context $commit.User}}</span>
<a href="{{$commit.User.HomeLink}}">{{$userName}}</a> <a href="{{$commit.User.HomeLink}}">{{$userName}}</a>
{{else}} {{else}}
{{avatarByEmail $.Context $commit.Commit.Author.Email $userName}} <span class="gt-mr-2">{{avatarByEmail $.Context $commit.Commit.Author.Email $userName}}</span>
{{$userName}} {{$userName}}
{{end}} {{end}}
</span> </span>

4
templates/repo/graph/svgcontainer.tmpl
Unescape View File

@ -14,9 +14,9 @@
{{- else if eq $glyph.Glyph '_' -}} {{- else if eq $glyph.Glyph '_' -}}
M {{Add (Mul $glyph.Column 5) 0}} {{Add (Mul $glyph.Row 12) 12}} h 10 {{/* */ -}} M {{Add (Mul $glyph.Column 5) 0}} {{Add (Mul $glyph.Row 12) 12}} h 10 {{/* */ -}}
{{- end -}} {{- end -}}
{{- end}}" stroke-width="1" fill="none" id="flow-{{$flow.ID}}-path" stroke-linecap="round"> {{- end}}" stroke-width="1" fill="none" id="flow-{{$flow.ID}}-path" stroke-linecap="round"></path>
{{range $flow.Commits}} {{range $flow.Commits}}
<circle class="flow-commit" cx="{{Add (Mul .Column 5) 5}}" cy="{{Add (Mul .Row 12) 6}}" r="2.5" stroke="none" id="flow-commit-{{.Rev}}" data-rev="{{.Rev}}"> <circle class="flow-commit" cx="{{Add (Mul .Column 5) 5}}" cy="{{Add (Mul .Row 12) 6}}" r="2.5" stroke="none" id="flow-commit-{{.Rev}}" data-rev="{{.Rev}}"></circle>
{{end}} {{end}}
</g> </g>
{{end}} {{end}}

Write Preview
Loading…
Cancel
Save