Skip to content

Commit 4918b76

Browse files
committed
fine tune
1 parent 76813a4 commit 4918b76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+108
-96
lines changed

templates/admin/auth/edit.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
</div>
441441
</div>
442442

443-
<div class="ui small gitea-custom delete modal">
443+
<div class="ui gitea-confirm-modal delete modal">
444444
<div class="header">
445445
{{svg "octicon-trash"}}
446446
{{.locale.Tr "admin.auths.delete_auth_title"}}

templates/admin/emails/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
{{template "base/paginate" .}}
7575

76-
<div class="ui gitea-custom modal" id="change-email-modal">
76+
<div class="ui gitea-confirm-modal modal" id="change-email-modal">
7777
<div class="header">
7878
{{.locale.Tr "admin.emails.change_email_header"}}
7979
</div>

templates/admin/monitor.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@
3737
{{template "admin/process" .}}
3838
</div>
3939
</div>
40-
<div class="ui small gitea-custom delete modal">
40+
<div class="ui gitea-confirm-modal delete modal">
4141
<div class="header">
42-
{{svg "octicon-x" 16 "close inside"}}
4342
{{.locale.Tr "admin.monitor.process.cancel"}}
4443
</div>
4544
<div class="content">

templates/admin/notice.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
</div>
7373

7474
<div class="ui modal admin" id="detail-modal">
75-
{{svg "octicon-x" 16 "close inside"}}
7675
<div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
7776
<div class="content">
7877
<div class="sub header"></div>

templates/admin/packages/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</div>
8181
</div>
8282

83-
<div class="ui small gitea-custom delete modal">
83+
<div class="ui gitea-confirm-modal delete modal">
8484
<div class="header">
8585
{{svg "octicon-trash"}}
8686
{{.locale.Tr "packages.settings.delete"}}

templates/admin/queue.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,8 @@
181181
</div>
182182
</div>
183183
</div>
184-
<div class="ui small gitea-custom delete modal">
184+
<div class="ui gitea-confirm-modal delete modal">
185185
<div class="header">
186-
{{svg "octicon-x" 16 "close inside"}}
187186
{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
188187
</div>
189188
<div class="content">

templates/admin/repo/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</div>
9696
</div>
9797

98-
<div class="ui small gitea-custom delete modal">
98+
<div class="ui gitea-confirm-modal delete modal">
9999
<div class="header">
100100
{{svg "octicon-trash"}}
101101
{{.locale.Tr "repo.settings.delete"}}

templates/admin/repo/unadopted.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<span class="name">{{$dir}}</span>
3030
<div class="right floated content">
3131
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
32-
<div class="ui gitea-custom modal" id="adopt-unadopted-modal-{{$dirI}}">
33-
{{svg "octicon-x" 16 "close inside"}}
32+
<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
3433
<div class="header">
3534
<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
3635
</div>
@@ -56,8 +55,7 @@
5655
</form>
5756
</div>
5857
<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
59-
<div class="ui gitea-custom modal" id="delete-unadopted-modal-{{$dirI}}">
60-
{{svg "octicon-x" 16 "close inside"}}
58+
<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
6159
<div class="header">
6260
<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
6361
</div>

templates/admin/stacktrace.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
</div>
1919
</div>
2020
</div>
21-
<div class="ui small gitea-custom delete modal">
21+
<div class="ui gitea-confirm-modal delete modal">
2222
<div class="header">
23-
{{svg "octicon-x" 16 "close inside"}}
2423
{{.locale.Tr "admin.monitor.process.cancel"}}
2524
</div>
2625
<div class="content">

templates/admin/user/edit.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
</div>
197197
</div>
198198

199-
<div class="ui small gitea-custom delete modal" id="delete-user-modal">
199+
<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
200200
<div class="header">
201201
{{svg "octicon-trash"}}
202202
{{.locale.Tr "settings.delete_account_title"}}

templates/org/member/members.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,17 @@
8181
{{template "base/paginate" .}}
8282
</div>
8383
</div>
84-
<div class="ui small gitea-custom delete modal" id="leave-organization">
84+
<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
8585
<div class="header">
86-
{{svg "octicon-x" 16 "close inside"}}
8786
{{$.locale.Tr "org.members.leave"}}
8887
</div>
8988
<div class="content">
9089
<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
9190
</div>
9291
{{template "base/modal_actions_confirm" .}}
9392
</div>
94-
<div class="ui small gitea-custom delete modal" id="remove-organization-member">
93+
<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
9594
<div class="header">
96-
{{svg "octicon-x" 16 "close inside"}}
9795
{{$.locale.Tr "org.members.remove"}}
9896
</div>
9997
<div class="content">

templates/org/settings/delete.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030
</div>
3131

32-
<div class="ui small gitea-custom delete modal">
32+
<div class="ui gitea-confirm-modal delete modal">
3333
<div class="header">
3434
{{svg "octicon-trash"}}
3535
{{.locale.Tr "org.settings.delete_org_title"}}

templates/org/team/members.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@
6464
</div>
6565
</div>
6666
</div>
67-
<div class="ui small gitea-custom delete modal" id="remove-team-member">
67+
<div class="ui gitea-confirm-modal delete modal" id="remove-team-member">
6868
<div class="header">
69-
{{svg "octicon-x" 16 "close inside"}}
7069
{{$.locale.Tr "org.members.remove"}}
7170
</div>
7271
<div class="content">

templates/org/team/new.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
</div>
149149
</div>
150150

151-
<div class="ui small gitea-custom delete modal">
151+
<div class="ui gitea-confirm-modal delete modal">
152152
<div class="header">
153153
{{svg "octicon-trash"}}
154154
{{.locale.Tr "org.teams.delete_team_title"}}

templates/org/team/repositories.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</div>
6565
</div>
6666

67-
<div class="ui small gitea-custom delete modal" id="org-team-remove-all-repo">
67+
<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo">
6868
<div class="header">
6969
{{svg "octicon-trash"}}
7070
{{.locale.Tr "org.teams.remove_all_repos_title"}}
@@ -75,7 +75,7 @@
7575
{{template "base/modal_actions_confirm" .}}
7676
</div>
7777

78-
<div class="ui small gitea-custom addall modal" id="org-team-add-all-repo">
78+
<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo">
7979
<div class="header">
8080
{{svg "octicon-globe"}}
8181
{{.locale.Tr "org.teams.add_all_repos_title"}}

templates/org/team/sidebar.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@
8383
</div>
8484
{{end}}
8585
</div>
86-
<div class="ui small gitea-custom delete modal" id="leave-team-sidebar">
86+
<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar">
8787
<div class="header">
88-
{{svg "octicon-x" 16 "close inside"}}
8988
{{$.locale.Tr "org.teams.leave"}}
9089
</div>
9190
<div class="content">

templates/org/team/teams.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
</div>
4444
</div>
4545
</div>
46-
<div class="ui small gitea-custom delete modal" id="leave-team">
46+
<div class="ui gitea-confirm-modal delete modal" id="leave-team">
4747
<div class="header">
48-
{{svg "octicon-x" 16 "close inside"}}
4948
{{$.locale.Tr "org.teams.leave"}}
5049
</div>
5150
<div class="content">

templates/package/settings.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<div class="ui attached error table danger segment">
4141
<div class="item">
4242
<div class="ui right">
43-
<button class="ui gitea-custom red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
43+
<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
4444
</div>
4545
<div>
4646
<h5>{{.locale.Tr "packages.settings.delete"}}</h5>

templates/projects/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</div>
7777

7878
{{if $.CanWriteProjects}}
79-
<div class="ui small gitea-custom delete modal">
79+
<div class="ui gitea-confirm-modal delete modal">
8080
<div class="header">
8181
{{svg "octicon-trash"}}
8282
{{.locale.Tr "repo.projects.deletion"}}

templates/projects/view.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</div>
151151
</div>
152152

153-
<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
153+
<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
154154
<div class="header">
155155
<span id="default-project-board-header"></span>
156156
</div>
@@ -160,7 +160,7 @@
160160
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
161161
</div>
162162

163-
<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
163+
<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
164164
<div class="header">
165165
{{$.locale.Tr "repo.projects.column.delete"}}
166166
</div>
@@ -272,7 +272,7 @@
272272
</div>
273273

274274
{{if .CanWriteProjects}}
275-
<div class="ui small gitea-custom delete modal">
275+
<div class="ui gitea-confirm-modal delete modal">
276276
<div class="header">
277277
{{svg "octicon-trash"}}
278278
{{.locale.Tr "repo.projects.deletion"}}

templates/repo/branch/list.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</td>
2323
<td class="right aligned overflow-visible">
2424
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
25-
<button class="ui gitea-custom jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
25+
<button class="ui gitea-confirm-modal jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
2626
{{svg "octicon-git-branch"}}
2727
</button>
2828
{{end}}
@@ -109,7 +109,7 @@
109109
</td>
110110
<td class="three wide right aligned overflow-visible">
111111
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
112-
<button class="ui gitea-custom jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
112+
<button class="ui gitea-confirm-modal jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
113113
{{svg "octicon-git-branch"}}
114114
</button>
115115
{{end}}
@@ -147,7 +147,7 @@
147147
</div>
148148
</div>
149149

150-
<div class="ui small gitea-custom delete modal">
150+
<div class="ui gitea-confirm-modal delete modal">
151151
<div class="header">
152152
{{svg "octicon-trash"}}
153153
{{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span>

templates/repo/commit_page.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
6060
data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
6161
data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
62-
<div class="ui gitea-custom modal" id="cherry-pick-modal">
62+
<div class="ui gitea-confirm-modal modal" id="cherry-pick-modal">
6363
<div class="header">
6464
<span id="cherry-pick-header"></span>
6565
</div>

templates/repo/editor/edit.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</div>
5757

5858

59-
<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
59+
<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
6060
<div class="header">
6161
{{svg "octicon-file"}}
6262
{{.locale.Tr "repo.editor.commit_empty_file_header"}}

templates/repo/editor/patch.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</form>
3737
</div>
3838

39-
<div class="ui small gitea-custom modal" id="edit-empty-content-modal">
39+
<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
4040
<div class="header">
4141
{{svg "octicon-file"}}
4242
{{.locale.Tr "repo.editor.commit_empty_file_header"}}

templates/repo/header.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
{{svg "octicon-repo-forked"}}{{$.locale.Tr "repo.fork"}}
119119
</a>
120120
<div class="ui small modal" id="fork-repo-modal">
121-
{{svg "octicon-x" 16 "close inside"}}
122121
<div class="header">
123122
{{$.locale.Tr "repo.already_forked" .Name}}
124123
</div>

templates/repo/issue/labels/edit_delete_label.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui small gitea-custom delete modal">
1+
<div class="ui gitea-confirm-modal delete modal">
22
<div class="header">
33
{{svg "octicon-trash"}}
44
{{.locale.Tr "repo.issues.label_deletion"}}

templates/repo/issue/milestones.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</div>
117117

118118
{{if or .CanWriteIssues .CanWritePulls}}
119-
<div class="ui small gitea-custom delete modal">
119+
<div class="ui gitea-confirm-modal delete modal">
120120
<div class="header">
121121
{{svg "octicon-trash"}}
122122
{{.locale.Tr "repo.milestones.deletion"}}

templates/repo/issue/view_content.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
198198
</div>
199199

200-
<div class="ui small gitea-custom delete modal">
200+
<div class="ui gitea-confirm-modal delete modal">
201201
<div class="header">
202202
{{svg "octicon-trash"}}
203203
{{.locale.Tr "repo.branch.delete" .HeadTarget}}

templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
543543
<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
544544

545-
<div class="ui gitea-custom modal remove-dependency">
545+
<div class="ui gitea-confirm-modal modal remove-dependency">
546546
<div class="header">
547547
{{svg "octicon-trash"}}
548548
{{.locale.Tr "repo.issues.dependency.remove_header"}}
@@ -656,7 +656,7 @@
656656
{{svg "octicon-trash"}}
657657
{{.locale.Tr "repo.issues.delete"}}
658658
</button>
659-
<div class="ui gitea-custom modal" id="delete">
659+
<div class="ui gitea-confirm-modal modal" id="delete">
660660
<div class="header">
661661
{{if .Issue.IsPull}}
662662
{{.locale.Tr "repo.pulls.delete.title"}}

templates/repo/migrate/migrating.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
{{if and .Failed .Permission.IsAdmin}}
3636
<div class="ui divider"></div>
3737
<div class="item">
38-
<button class="ui gitea-custom red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
38+
<button class="ui gitea-confirm-modal red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
3939
</div>
4040
{{end}}
4141
</div>

templates/repo/projects/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</div>
7979

8080
{{if .CanWriteProjects}}
81-
<div class="ui small gitea-custom delete modal">
81+
<div class="ui gitea-confirm-modal delete modal">
8282
<div class="header">
8383
{{svg "octicon-trash"}}
8484
{{.locale.Tr "repo.projects.deletion"}}

templates/repo/projects/view.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
</div>
157157
</div>
158158

159-
<div class="ui gitea-custom modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
159+
<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
160160
<div class="header">
161161
<span id="default-project-board-header"></span>
162162
</div>
@@ -166,7 +166,7 @@
166166
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
167167
</div>
168168

169-
<div class="ui gitea-custom modal" id="delete-board-modal-{{.ID}}">
169+
<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
170170
<div class="header">
171171
{{$.locale.Tr "repo.projects.column.delete"}}
172172
</div>
@@ -278,7 +278,7 @@
278278
</div>
279279

280280
{{if or .CanWriteIssues .CanWritePulls}}
281-
<div class="ui small gitea-custom delete modal">
281+
<div class="ui gitea-confirm-modal delete modal">
282282
<div class="header">
283283
{{svg "octicon-trash"}}
284284
{{.locale.Tr "repo.projects.deletion"}}

templates/repo/release/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
</div>
185185

186186
{{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
187-
<div class="ui small gitea-custom delete modal">
187+
<div class="ui gitea-confirm-modal delete modal">
188188
<div class="ui header">
189189
{{svg "octicon-trash" 16 "gt-mr-2"}}
190190
{{.locale.Tr "repo.release.delete_tag"}}

0 commit comments

Comments
 (0)