Skip to content

Commit e97baed

Browse files
wxiaoguangwxiaoguang
authored
Remove a gt-float-right and some unnecessary helpers (#27110)
Follow Remove polluted .ui.right #26825 Remove more `gt-float-right`, remove unnecessary helpers, remove negative margin tricks. ![image](https://github.com/go-gitea/gitea/assets/2114189/2785c6e6-7823-4699-a4f3-184eef50ceda)
1 parent 558eea6 commit e97baed

File tree

2 files changed

+35
-56
lines changed

2 files changed

+35
-56
lines changed

‎templates/repo/release/list.tmpl

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
</div>
1717
<div class="ui twelve wide column detail">
1818
<div class="gt-df gt-ac gt-sb gt-fw gt-mb-3">
19-
<h4 class="release-list-title gt-df gt-ac">
19+
<h4 class="release-list-title">
2020
<a href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}">{{.Title}}</a>
2121
{{if .IsDraft}}
22-
<span class="ui yellow label gt-ml-3 gt-mt-1">{{$.locale.Tr "repo.release.draft"}}</span>
22+
<span class="ui yellow label">{{$.locale.Tr "repo.release.draft"}}</span>
2323
{{else if .IsPrerelease}}
24-
<span class="ui orange label gt-ml-3 gt-mt-1">{{$.locale.Tr "repo.release.prerelease"}}</span>
24+
<span class="ui orange label">{{$.locale.Tr "repo.release.prerelease"}}</span>
2525
{{else if not .IsTag}}
26-
<span class="ui green label gt-ml-3 gt-mt-1">{{$.locale.Tr "repo.release.stable"}}</span>
26+
<span class="ui green label">{{$.locale.Tr "repo.release.stable"}}</span>
2727
{{end}}
2828
</h4>
29-
<div class="gt-df gt-ac">
29+
<div>
3030
{{if and $.CanCreateRelease (not .IsTag)}}
31-
<a class="muted gt-ml-3 gt-df gt-ac" data-tooltip-content="{{$.locale.Tr "repo.release.edit"}}" href="{{$.RepoLink}}/releases/edit/{{.TagName | PathEscapeSegments}}" rel="nofollow">
31+
<a class="muted" data-tooltip-content="{{$.locale.Tr "repo.release.edit"}}" href="{{$.RepoLink}}/releases/edit/{{.TagName | PathEscapeSegments}}" rel="nofollow">
3232
{{svg "octicon-pencil"}}
3333
</a>
3434
{{end}}
@@ -38,7 +38,7 @@
3838
<p class="text grey">
3939
{{if gt .Publisher.ID 0}}
4040
<span class="author">
41-
{{ctx.AvatarUtils.Avatar .Publisher 20}}
41+
{{ctx.AvatarUtils.Avatar .Publisher 20 "gt-mr-2"}}
4242
<a href="{{.Publisher.HomeLink}}">{{.Publisher.Name}}</a>
4343
</span>
4444
<span class="released">
@@ -55,9 +55,9 @@
5555
<p class="text grey">
5656
<span class="author">
5757
{{if .OriginalAuthor}}
58-
{{svg "octicon-mark-github" 16 "gt-mr-2"}}{{.OriginalAuthor}}
58+
{{svg "octicon-mark-github" 20 "gt-mr-2"}}{{.OriginalAuthor}}
5959
{{else if .Publisher}}
60-
{{ctx.AvatarUtils.Avatar .Publisher 20}}
60+
{{ctx.AvatarUtils.Avatar .Publisher 20 "gt-mr-2"}}
6161
<a href="{{.Publisher.HomeLink}}">{{.Publisher.GetDisplayName}}</a>
6262
{{else}}
6363
Ghost
@@ -77,8 +77,9 @@
7777
<div class="markup desc">
7878
{{Str2html .Note}}
7979
</div>
80-
<details class="download gt-border-secondary-top gt-mt-4 gt-pt-4" {{if eq $idx 0}}open{{end}}>
81-
<summary class="gt-mb-4">
80+
<div class="divider"></div>
81+
<details class="download" {{if eq $idx 0}}open{{end}}>
82+
<summary class="gt-my-4">
8283
{{$.locale.Tr "repo.release.downloads"}}
8384
</summary>
8485
<ul class="list">
@@ -93,21 +94,21 @@
9394
{{if .Attachments}}
9495
{{range .Attachments}}
9596
<li>
96-
<span class="gt-float-right">
97-
<span class="ui text grey">{{.Size | FileSize}}</span>
97+
<a target="_blank" rel="nofollow" href="{{.DownloadURL}}">
98+
<strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong>
99+
</a>
100+
<div>
101+
<span class="text grey">{{.Size | FileSize}}</span>
98102
<span data-tooltip-content="{{$.locale.Tr "repo.release.download_count" ($.locale.PrettyNumber .DownloadCount)}}">
99103
{{svg "octicon-info"}}
100104
</span>
101-
</span>
102-
<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}">
103-
<strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong>
104-
</a>
105+
</div>
105106
</li>
106107
{{end}}
107108
{{end}}
108109
</ul>
109110
</details>
110-
<span class="dot">&nbsp;</span>
111+
<div class="dot"></div>
111112
</div>
112113
</li>
113114
{{end}}

‎web_src/css/repo/release-tag.css

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,14 @@
77
.repository.releases #release-list .release-list-title {
88
font-size: 2rem;
99
font-weight: var(--font-weight-normal);
10-
margin-top: -4px;
11-
margin-bottom: 0;
12-
}
13-
14-
.repository.releases #release-list > li {
15-
list-style: none;
16-
}
17-
18-
.repository.releases #release-list > li .meta,
19-
.repository.releases #release-list > li .detail {
20-
padding-top: 30px;
21-
padding-bottom: 40px;
10+
display: flex;
11+
align-items: center;
12+
gap: 0.25em;
13+
margin: 0;
2214
}
2315

2416
.repository.releases #release-list > li .meta {
25-
margin-top: 4px;
17+
padding-top: 25px;
2618
position: relative;
2719
text-align: right;
2820
display: flex;
@@ -31,44 +23,30 @@
3123
}
3224

3325
.repository.releases #release-list > li .detail {
26+
padding-bottom: 20px;
3427
border-left: 1px solid var(--color-secondary);
3528
}
3629

3730
.repository.releases #release-list > li .detail .author img {
38-
margin-bottom: 3px;
39-
}
40-
41-
.repository.releases #release-list > li .detail .download > a .svg {
42-
margin-left: 5px;
43-
margin-right: 5px;
31+
margin-bottom: 2px; /* the legacy trick to align the avatar vertically, no better solution at the moment */
4432
}
4533

4634
.repository.releases #release-list > li .detail .download .list {
4735
padding-left: 0;
48-
}
49-
50-
.repository.releases #release-list > li .detail .download .list li {
51-
list-style: none;
52-
display: block;
53-
padding: 8px;
5436
border: 1px solid var(--color-secondary);
37+
border-radius: var(--border-radius);
5538
background: var(--color-light);
5639
}
5740

58-
.repository.releases #release-list > li .detail .download .list li a > .text.right {
59-
margin-right: 5px;
60-
}
61-
62-
.repository.releases #release-list > li .detail .download .list li + li {
63-
border-top: 0;
64-
}
65-
66-
.repository.releases #release-list > li .detail .download .list li:first-of-type {
67-
border-radius: var(--border-radius) 0 0 var(--border-radius);
41+
.repository.releases #release-list > li .detail .download .list li {
42+
display: flex;
43+
justify-content: space-between;
44+
padding: 8px;
45+
border-bottom: 1px solid var(--color-secondary);
6846
}
6947

70-
.repository.releases #release-list > li .detail .download .list li:last-of-type {
71-
border-radius: 0 var(--border-radius) var(--border-radius) 0;
48+
.repository.releases #release-list > li .detail .download .list li:last-child {
49+
border-bottom: none;
7250
}
7351

7452
.repository.releases #release-list > li .detail .dot {
@@ -77,7 +55,7 @@
7755
background-color: var(--color-secondary-dark-3);
7856
position: absolute;
7957
left: -5.5px;
80-
top: 40px;
58+
top: 30px;
8159
border-radius: var(--border-radius-circle);
8260
border: 2.5px solid var(--color-body);
8361
}

0 commit comments

Comments
 (0)