From e97baed800ed9b83c5634492205318ab0c820719 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 18 Sep 2023 12:25:36 +0800
Subject: [PATCH] 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.
---
templates/repo/release/list.tmpl | 37 +++++++++++-----------
web_src/css/repo/release-tag.css | 54 ++++++++++----------------------
2 files changed, 35 insertions(+), 56 deletions(-)
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index b93134b5d95..a717fba6510 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -16,19 +16,19 @@
</div>
<div class="ui twelve wide column detail">
<div class="gt-df gt-ac gt-sb gt-fw gt-mb-3">
- <h4 class="release-list-title gt-df gt-ac">
+ <h4 class="release-list-title">
<a href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}">{{.Title}}</a>
{{if .IsDraft}}
- <span class="ui yellow label gt-ml-3 gt-mt-1">{{$.locale.Tr "repo.release.draft"}}</span>
+ <span class="ui yellow label">{{$.locale.Tr "repo.release.draft"}}</span>
{{else if .IsPrerelease}}
- <span class="ui orange label gt-ml-3 gt-mt-1">{{$.locale.Tr "repo.release.prerelease"}}</span>
+ <span class="ui orange label">{{$.locale.Tr "repo.release.prerelease"}}</span>
{{else if not .IsTag}}
- <span class="ui green label gt-ml-3 gt-mt-1">{{$.locale.Tr "repo.release.stable"}}</span>
+ <span class="ui green label">{{$.locale.Tr "repo.release.stable"}}</span>
{{end}}
</h4>
- <div class="gt-df gt-ac">
+ <div>
{{if and $.CanCreateRelease (not .IsTag)}}
- <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">
+ <a class="muted" data-tooltip-content="{{$.locale.Tr "repo.release.edit"}}" href="{{$.RepoLink}}/releases/edit/{{.TagName | PathEscapeSegments}}" rel="nofollow">
{{svg "octicon-pencil"}}
</a>
{{end}}
@@ -38,7 +38,7 @@
<p class="text grey">
{{if gt .Publisher.ID 0}}
<span class="author">
- {{ctx.AvatarUtils.Avatar .Publisher 20}}
+ {{ctx.AvatarUtils.Avatar .Publisher 20 "gt-mr-2"}}
<a href="{{.Publisher.HomeLink}}">{{.Publisher.Name}}</a>
</span>
<span class="released">
@@ -55,9 +55,9 @@
<p class="text grey">
<span class="author">
{{if .OriginalAuthor}}
- {{svg "octicon-mark-github" 16 "gt-mr-2"}}{{.OriginalAuthor}}
+ {{svg "octicon-mark-github" 20 "gt-mr-2"}}{{.OriginalAuthor}}
{{else if .Publisher}}
- {{ctx.AvatarUtils.Avatar .Publisher 20}}
+ {{ctx.AvatarUtils.Avatar .Publisher 20 "gt-mr-2"}}
<a href="{{.Publisher.HomeLink}}">{{.Publisher.GetDisplayName}}</a>
{{else}}
Ghost
@@ -77,8 +77,9 @@
<div class="markup desc">
{{Str2html .Note}}
</div>
- <details class="download gt-border-secondary-top gt-mt-4 gt-pt-4" {{if eq $idx 0}}open{{end}}>
- <summary class="gt-mb-4">
+ <div class="divider"></div>
+ <details class="download" {{if eq $idx 0}}open{{end}}>
+ <summary class="gt-my-4">
{{$.locale.Tr "repo.release.downloads"}}
</summary>
<ul class="list">
@@ -93,21 +94,21 @@
{{if .Attachments}}
{{range .Attachments}}
<li>
- <span class="gt-float-right">
- <span class="ui text grey">{{.Size | FileSize}}</span>
+ <a target="_blank" rel="nofollow" href="{{.DownloadURL}}">
+ <strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong>
+ </a>
+ <div>
+ <span class="text grey">{{.Size | FileSize}}</span>
<span data-tooltip-content="{{$.locale.Tr "repo.release.download_count" ($.locale.PrettyNumber .DownloadCount)}}">
{{svg "octicon-info"}}
</span>
- </span>
- <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}">
- <strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong>
- </a>
+ </div>
</li>
{{end}}
{{end}}
</ul>
</details>
- <span class="dot"> </span>
+ <div class="dot"></div>
</div>
</li>
{{end}}
diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css
index 5d1830f16a9..a146eda6a97 100644
--- a/web_src/css/repo/release-tag.css
+++ b/web_src/css/repo/release-tag.css
@@ -7,22 +7,14 @@
.repository.releases #release-list .release-list-title {
font-size: 2rem;
font-weight: var(--font-weight-normal);
- margin-top: -4px;
- margin-bottom: 0;
-}
-
-.repository.releases #release-list > li {
- list-style: none;
-}
-
-.repository.releases #release-list > li .meta,
-.repository.releases #release-list > li .detail {
- padding-top: 30px;
- padding-bottom: 40px;
+ display: flex;
+ align-items: center;
+ gap: 0.25em;
+ margin: 0;
}
.repository.releases #release-list > li .meta {
- margin-top: 4px;
+ padding-top: 25px;
position: relative;
text-align: right;
display: flex;
@@ -31,44 +23,30 @@
}
.repository.releases #release-list > li .detail {
+ padding-bottom: 20px;
border-left: 1px solid var(--color-secondary);
}
.repository.releases #release-list > li .detail .author img {
- margin-bottom: 3px;
-}
-
-.repository.releases #release-list > li .detail .download > a .svg {
- margin-left: 5px;
- margin-right: 5px;
+ margin-bottom: 2px; /* the legacy trick to align the avatar vertically, no better solution at the moment */
}
.repository.releases #release-list > li .detail .download .list {
padding-left: 0;
-}
-
-.repository.releases #release-list > li .detail .download .list li {
- list-style: none;
- display: block;
- padding: 8px;
border: 1px solid var(--color-secondary);
+ border-radius: var(--border-radius);
background: var(--color-light);
}
-.repository.releases #release-list > li .detail .download .list li a > .text.right {
- margin-right: 5px;
+.repository.releases #release-list > li .detail .download .list li {
+ display: flex;
+ justify-content: space-between;
+ padding: 8px;
+ border-bottom: 1px solid var(--color-secondary);
}
-.repository.releases #release-list > li .detail .download .list li + li {
- border-top: 0;
-}
-
-.repository.releases #release-list > li .detail .download .list li:first-of-type {
- border-radius: var(--border-radius) 0 0 var(--border-radius);
-}
-
-.repository.releases #release-list > li .detail .download .list li:last-of-type {
- border-radius: 0 var(--border-radius) var(--border-radius) 0;
+.repository.releases #release-list > li .detail .download .list li:last-child {
+ border-bottom: none;
}
.repository.releases #release-list > li .detail .dot {
@@ -77,7 +55,7 @@
background-color: var(--color-secondary-dark-3);
position: absolute;
left: -5.5px;
- top: 40px;
+ top: 30px;
border-radius: var(--border-radius-circle);
border: 2.5px solid var(--color-body);
}