loading up the forgejo repo on tangled to test page performance
Merge pull request '[FEAT] Visual separation between types of attachments' (#2899) from gusted/forgejo-attachment-divide into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2899
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
+30
-15
+2
-1
options/locale/locale_en-US.ini
+2
-1
options/locale/locale_en-US.ini
···
2635
2635
release.tag_name_protected = The tag name is protected.
2636
2636
release.tag_already_exist = This tag name already exists.
2637
2637
release.downloads = Downloads
2638
-
release.download_count = Downloads: %s
2638
+
release.download_count = %s downloads
2639
2639
release.add_tag_msg = Use the title and content of release as tag message.
2640
2640
release.add_tag = Create Tag Only
2641
2641
release.releases_for = Releases for %s
2642
2642
release.tags_for = Tags for %s
2643
+
release.system_generated = This attachment is automatically generated.
2643
2644
2644
2645
branch.name = Branch name
2645
2646
branch.already_exists = A branch named "%s" already exists.
+10
-5
templates/repo/release/list.tmpl
+10
-5
templates/repo/release/list.tmpl
···
67
67
{{ctx.Locale.Tr "repo.release.downloads"}}
68
68
</summary>
69
69
<ul class="list">
70
+
{{$hasReleaseAttachment := gt (len $release.Attachments) 0}}
70
71
{{if and (not $.DisableDownloadSourceArchives) (not $release.IsDraft) ($.Permission.CanRead $.UnitTypeCode)}}
71
72
<li>
72
73
<a class="archive-link" href="{{$.RepoLink}}/archive/{{$release.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (ZIP)</strong></a>
74
+
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.system_generated"}}">
75
+
{{svg "octicon-info"}}
76
+
</span>
73
77
</li>
74
-
<li>
78
+
<li class="{{if $hasReleaseAttachment}}start-gap{{end}}">
75
79
<a class="archive-link" href="{{$.RepoLink}}/archive/{{$release.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (TAR.GZ)</strong></a>
80
+
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.system_generated"}}">
81
+
{{svg "octicon-info"}}
82
+
</span>
76
83
</li>
84
+
{{if $hasReleaseAttachment}}<hr>{{end}}
77
85
{{end}}
78
86
{{range $release.Attachments}}
79
87
<li>
···
81
89
<strong>{{svg "octicon-package" 16 "tw-mr-1"}}{{.Name}}</strong>
82
90
</a>
83
91
<div>
84
-
<span class="text grey">{{.Size | ctx.Locale.TrSize}}</span>
85
-
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}}">
86
-
{{svg "octicon-info"}}
87
-
</span>
92
+
<span class="text grey">{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}} · {{.Size | ctx.Locale.TrSize}}</span>
88
93
</div>
89
94
</li>
90
95
{{end}}
+1
-4
templates/repo/release/new.tmpl
+1
-4
templates/repo/release/new.tmpl
···
64
64
<div class="flex-text-inline tw-flex-1">
65
65
<input name="attachment-edit-{{.UUID}}" class="attachment_edit" required value="{{.Name}}">
66
66
<input name="attachment-del-{{.UUID}}" type="hidden" value="false">
67
-
<span class="ui text grey tw-whitespace-nowrap">{{.Size | ctx.Locale.TrSize}}</span>
68
-
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}}">
69
-
{{svg "octicon-info"}}
70
-
</span>
67
+
<span class="ui text grey tw-whitespace-nowrap">{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}} · {{.Size | ctx.Locale.TrSize}}</span>
71
68
</div>
72
69
<a class="ui mini compact red button remove-rel-attach" data-id="{{.ID}}" data-uuid="{{.UUID}}">
73
70
{{ctx.Locale.Tr "remove"}}
+17
-5
web_src/css/repo/release-tag.css
+17
-5
web_src/css/repo/release-tag.css
···
33
33
34
34
.repository.releases #release-list > li .detail .download .list {
35
35
padding-left: 0;
36
-
border: 1px solid var(--color-secondary);
37
-
border-radius: var(--border-radius);
38
-
background: var(--color-light);
39
36
}
40
37
41
38
.repository.releases #release-list > li .detail .download .list li {
39
+
background: var(--color-light);
40
+
border: 1px solid var(--color-secondary);
41
+
border-top: none;
42
42
display: flex;
43
43
justify-content: space-between;
44
44
padding: 8px;
45
+
}
46
+
47
+
.repository.releases #release-list > li .detail .download .list :is(li:first-child, .start-gap + hr + li) {
48
+
border-top: 1px solid var(--color-secondary);
49
+
border-top-left-radius: var(--border-radius);
50
+
border-top-right-radius: var(--border-radius);
51
+
}
52
+
53
+
.repository.releases #release-list > li .detail .download .list :is(li:last-child, .start-gap) {
45
54
border-bottom: 1px solid var(--color-secondary);
55
+
border-bottom-left-radius: var(--border-radius);
56
+
border-bottom-right-radius: var(--border-radius);
46
57
}
47
58
48
-
.repository.releases #release-list > li .detail .download .list li:last-child {
49
-
border-bottom: none;
59
+
.repository.releases #release-list > li .detail .download .list hr {
60
+
height: 8px;
61
+
margin: 0;
50
62
}
51
63
52
64
.repository.releases #release-list > li .detail .dot {