Skip to content

Commit e6f8e93

Browse files
KN4CK3RGiteaBot
andauthored
Use flex classes in package settings (#26314)
Regression of #25790 Fixes #26310 --------- Co-authored-by: Giteabot <[email protected]>
1 parent daf7092 commit e6f8e93

File tree

2 files changed

+39
-31
lines changed

2 files changed

+39
-31
lines changed

templates/org/team/members.tmpl

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,23 @@
5353
</div>
5454
{{if and .Invites $.IsOrganizationOwner}}
5555
<h4 class="ui top attached header">{{$.locale.Tr "org.teams.invite_team_member.list"}}</h4>
56-
<div class="ui bottom attached table segment members">
57-
{{range .Invites}}
58-
<div class="item gt-df gt-ac gt-fw">
59-
<span class="gt-f1">{{.Email}}</span>
60-
<form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post">
61-
{{$.CsrfTokenHtml}}
62-
<input type="hidden" name="iid" value="{{.ID}}">
63-
<button class="ui red button">{{$.locale.Tr "org.members.remove"}}</button>
64-
</form>
65-
</div>
66-
{{end}}
56+
<div class="ui attached segment">
57+
<div class="flex-list">
58+
{{range .Invites}}
59+
<div class="flex-item flex-item-center">
60+
<div class="flex-item-main">
61+
{{.Email}}
62+
</div>
63+
<div class="flex-item-trailing">
64+
<form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post">
65+
{{$.CsrfTokenHtml}}
66+
<input type="hidden" name="iid" value="{{.ID}}">
67+
<button class="ui red button">{{$.locale.Tr "org.members.remove"}}</button>
68+
</form>
69+
</div>
70+
</div>
71+
{{end}}
72+
</div>
6773
</div>
6874
{{end}}
6975
</div>

templates/package/settings.tmpl

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,30 @@
3838
<h4 class="ui top attached error header">
3939
{{.locale.Tr "repo.settings.danger_zone"}}
4040
</h4>
41-
<div class="ui attached error table danger segment">
42-
<div class="item">
43-
<div class="ui right">
44-
<button class="ui basic red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
45-
</div>
46-
<div>
47-
<h5>{{.locale.Tr "packages.settings.delete"}}</h5>
48-
<p>{{.locale.Tr "packages.settings.delete.description"}}</p>
49-
</div>
50-
<div class="ui tiny modal" id="delete-package-modal">
51-
<div class="header">
52-
{{.locale.Tr "packages.settings.delete"}}
41+
<div class="ui attached error danger segment">
42+
<div class="flex-list">
43+
<div class="flex-item">
44+
<div class="flex-item-main">
45+
<div class="flex-item-title">{{.locale.Tr "packages.settings.delete"}}</div>
46+
<div class="flex-item-body">{{.locale.Tr "packages.settings.delete.description"}}</div>
5347
</div>
54-
<div class="content">
55-
<div class="ui warning message gt-word-break">
56-
{{.locale.Tr "packages.settings.delete.notice" .PackageDescriptor.Package.Name .PackageDescriptor.Version.Version}}
48+
<div class="flex-item-trailing">
49+
<button class="ui basic red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
50+
</div>
51+
<div class="ui tiny modal" id="delete-package-modal">
52+
<div class="header">
53+
{{.locale.Tr "packages.settings.delete"}}
54+
</div>
55+
<div class="content">
56+
<div class="ui warning message gt-word-break">
57+
{{.locale.Tr "packages.settings.delete.notice" .PackageDescriptor.Package.Name .PackageDescriptor.Version.Version}}
58+
</div>
59+
<form class="ui form" action="{{.Link}}" method="post">
60+
{{.CsrfTokenHtml}}
61+
<input type="hidden" name="action" value="delete">
62+
{{template "base/modal_actions_confirm" .}}
63+
</form>
5764
</div>
58-
<form class="ui form" action="{{.Link}}" method="post">
59-
{{.CsrfTokenHtml}}
60-
<input type="hidden" name="action" value="delete">
61-
{{template "base/modal_actions_confirm" .}}
62-
</form>
6365
</div>
6466
</div>
6567
</div>

0 commit comments

Comments
 (0)