diff options
| author | silverwind <me@silverwind.io> | 2021-03-22 05:04:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 05:04:19 +0100 |
| commit | 1a03fa7a4f353eb2f965cdcac39f630c281eca1e (patch) | |
| tree | 042e54d01f25afff9f78c38cdc3d1c2da062118f /templates | |
| parent | a587a284349e7c27d1bec39ef0dedb3972ef68c5 (diff) | |
| download | gitea-1a03fa7a4f353eb2f965cdcac39f630c281eca1e.tar.gz gitea-1a03fa7a4f353eb2f965cdcac39f630c281eca1e.zip | |
Update JS dependencies (#15033)
* Update JS dependencies
- Update all JS dependencies
- For octicons, rename trashcan to trash
- For svgo, migrate to v2 api, output seems to have slightly changed but icons look the same
- For stylelint, update config, fix custom property duplicates
- For monaco, drop legacy Edge support
- For eslint, enable new rules, fix new issues
- For less-loader, remove deprecated import syntax
* update svgo usage in generate-images and rebuild logo.svg with it
Diffstat (limited to 'templates')
44 files changed, 60 insertions, 60 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 6b24858395..da1ea42a74 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -337,7 +337,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "admin.auths.delete_auth_title"}} </div> <div class="content"> diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index a8431cbd77..16c4d88002 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -86,7 +86,7 @@ <td>{{.Description}}</td> <td>{{DateFmtLong .Start}}</td> <td>{{TimeSince .Start $.Lang}}</td> - <td><a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Description}}">{{svg "octicon-trashcan" 16 "text-red"}}</a></td> + <td><a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Description}}">{{svg "octicon-trash" 16 "text-red"}}</a></td> </tr> {{end}} </tbody> diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index 278b246502..3d9cc95592 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -130,7 +130,7 @@ <td>{{DateFmtLong .Start}}</td> <td>{{if .HasTimeout}}{{DateFmtLong .Timeout}}{{else}}-{{end}}</td> <td> - <a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}"><span class="text red" title="{{$.i18n.Tr "remove"}}">{{svg "octicon-trashcan"}}</span></a> + <a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}"><span class="text red" title="{{$.i18n.Tr "remove"}}">{{svg "octicon-trash"}}</span></a> </td> </tr> {{else}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 17a6871b3a..aff30ab510 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -62,7 +62,7 @@ <td>{{.NumIssues}}</td> <td>{{SizeFmt .Size}}</td> <td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td> - <td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trashcan"}}</a></td> + <td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td> </tr> {{end}} </tbody> @@ -75,7 +75,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.settings.delete"}} </div> <div class="content"> diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index bd47dd0262..481d77dfd2 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -45,7 +45,7 @@ <input type="hidden" name="page" value="{{$.CurrentPage}}"> <div class="actions"> <div class="ui red basic inverted cancel button"> - {{svg "octicon-trashcan" 16 "mr-2"}} + {{svg "octicon-trash" 16 "mr-2"}} {{$.i18n.Tr "modal.no"}} </div> <button class="ui green basic inverted ok button"> @@ -72,7 +72,7 @@ <input type="hidden" name="page" value="{{$.CurrentPage}}"> <div class="actions"> <div class="ui red basic inverted cancel button"> - {{svg "octicon-trashcan" 16 "mr-2"}} + {{svg "octicon-trash" 16 "mr-2"}} {{$.i18n.Tr "modal.no"}} </div> <button class="ui green basic inverted ok button"> diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index a07f3a1054..af01489c0a 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -133,7 +133,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.delete_account_title"}} </div> <div class="content"> diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl index 7a0760b125..ba9a94d0b6 100644 --- a/templates/base/delete_modal_actions.tmpl +++ b/templates/base/delete_modal_actions.tmpl @@ -1,6 +1,6 @@ <div class="actions"> <div class="ui red basic inverted cancel button"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "modal.no"}} </div> <div class="ui green basic inverted ok button"> diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index def83d9726..ec5c17b6b4 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -100,7 +100,7 @@ class="ui button mini compact basic icon fitted poping up" data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}" data-position="top right" data-variation="small inverted" - >{{svg "octicon-trashcan"}}</button> + >{{svg "octicon-trash"}}</button> </form> </div> </div> diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index d4911e74b8..1cf24639df 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -31,7 +31,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "org.settings.delete_org_title"}} </div> <div class="content"> diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 85f945c834..b4c385a2b0 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -116,7 +116,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "org.teams.delete_team_title"}} </div> <div class="content"> diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 3b5f1b33fb..350e8a4628 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -66,7 +66,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "org.teams.remove_all_repos_title"}} </div> <div class="content"> diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 8176738ff6..87c05e7b42 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -116,7 +116,7 @@ <a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name)}}" data-variation="tiny inverted" data-position="top right"><span class="text blue">{{svg "octicon-reply"}}</span></a> {{else}} <a class="ui basic jump button icon poping up delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name)}}" data-variation="tiny inverted" data-position="top right" data-name="{{.Name}}"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} </a> {{end}} {{end}} @@ -134,7 +134,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span> </div> <div class="content"> diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index ed7e585e4e..8e1f914d5f 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -1,6 +1,6 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.issues.label_deletion"}} </div> <div class="content"> diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 5b50620b61..4faec9a5ab 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -47,10 +47,10 @@ </div> <div class="three wide column"> {{if and (not $.PageIsOrgSettingsLabels ) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} - <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{else if $.PageIsOrgSettingsLabels}} - <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{end}} </div> diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 89ae813d45..ecb7cd95f1 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -76,7 +76,7 @@ {{else}} <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x"}} {{$.i18n.Tr "repo.milestones.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Content}} @@ -95,7 +95,7 @@ {{if or .CanWriteIssues .CanWritePulls}} <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.milestones.deletion"}} </div> <div class="content"> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 0119c12cd8..7ca6485053 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -218,7 +218,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.branch.delete" .HeadTarget }} </div> <div class="content"> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 0aaa806450..0cae8bdf95 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -383,7 +383,7 @@ </span> {{if .DependentIssue}} <div class="detail"> - <span class="text grey">{{svg "octicon-trashcan"}}</span> + <span class="text grey">{{svg "octicon-trash"}}</span> <span class="text grey"> <a href="{{.DependentIssue.HTMLURL}}"> {{if eq .DependentIssue.RepoID .Issue.RepoID}} diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index a28d222f86..9ece0f43e2 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -13,7 +13,7 @@ </div> </div> <button class="ui icon button compact mini issue-delete-time poping up" data-id="{{.comment.Time.ID}}" data-content="{{.ctx.i18n.Tr "repo.issues.del_time"}}" data-position="top right" data-variation="tiny inverted"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} </button> </span> {{end}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 2175fad067..d62d4b7609 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -73,7 +73,7 @@ {{if .CanChange }} <a href="#" class="ui poping up icon re-request-review {{if .Checked}}checked{{end}}" data-issue-id="{{$.Issue.ID}}" data-content="{{if .Checked}} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> - {{if .Checked}} {{svg "octicon-trashcan"}} {{else}} {{svg "octicon-sync"}} {{end}} + {{if .Checked}} {{svg "octicon-trash"}} {{else}} {{svg "octicon-sync"}} {{end}} </a> {{end}} {{svg (printf "octicon-%s" .Review.Type.Icon)}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index f51f6a5265..872a86e658 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -70,7 +70,7 @@ {{if .CanChange}} <a href="#" class="ui poping up icon re-request-review {{if .Checked}}checked{{end}}" data-content="{{if .Checked}} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> - {{if .Checked}} {{svg "octicon-trashcan"}} {{else}} {{svg "octicon-sync"}} {{end}} + {{if .Checked}} {{svg "octicon-trash"}} {{else}} {{svg "octicon-sync"}} {{end}} </a> {{end}} {{svg (printf "octicon-%s" .Review.Type.Icon)}} @@ -469,7 +469,7 @@ {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blocking');" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> - {{svg "octicon-trashcan" 16}} + {{svg "octicon-trash" 16}} </a> {{end}} </div> @@ -497,7 +497,7 @@ {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blockedBy');" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> - {{svg "octicon-trashcan" 16}} + {{svg "octicon-trash" 16}} </a> {{end}} </div> @@ -536,7 +536,7 @@ <div class="ui basic modal remove-dependency"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.issues.dependency.remove_header"}} </div> <div class="content"> diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 6ea936e8b6..ec7370709f 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -59,7 +59,7 @@ {{else}} <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-skip"}} {{$.i18n.Tr "repo.projects.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Description}} @@ -78,7 +78,7 @@ {{if or .CanWriteIssues .CanWritePulls}} <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.projects.deletion"}} </div> <div class="content"> diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 1d4a26837e..7a1583e556 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -58,7 +58,7 @@ </a> {{end}} <a class="item delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/delete" data-id="{{.Project.ID}}"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} <span class="mx-3">{{$.i18n.Tr "repo.issues.label_delete"}}</span> </a> </div> @@ -92,7 +92,7 @@ </a> {{end}} <a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{$.i18n.Tr "repo.projects.board.delete"}} </a> @@ -203,7 +203,7 @@ {{if or .CanWriteIssues .CanWritePulls}} <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.projects.deletion"}} </div> <div class="content"> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 780a75ad89..5271f650ee 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -44,7 +44,7 @@ {{end}} {{if (and ($.Permission.CanWrite $.UnitTypeCode) $release.IsTag)}} <a class="ui red delete-button mr-3" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}"> - {{svg "octicon-trashcan" 16 "mr-2"}}{{$.i18n.Tr "repo.release.delete_tag"}} + {{svg "octicon-trash" 16 "mr-2"}}{{$.i18n.Tr "repo.release.delete_tag"}} </a> {{end}} {{if (not $release.IsTag)}} @@ -179,7 +179,7 @@ {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}} <div class="ui small basic delete modal"> <div class="ui header"> - {{svg "octicon-trashcan" 16 "mr-2"}} + {{svg "octicon-trash" 16 "mr-2"}} {{.i18n.Tr "repo.release.delete_tag"}} </div> <div class="content"> diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index ef9115d1e2..485cc7138a 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -121,7 +121,7 @@ {{if .PageIsEditRelease}} <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.release.deletion"}} </div> <div class="content"> diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index cb0808714f..864b2968fc 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -114,7 +114,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.settings.collaborator_deletion"}} </div> <div class="content"> diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 8a75903bce..8e052ac303 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -82,7 +82,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.settings.deploy_key_deletion"}} </div> <div class="content"> diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 79477051b3..ab3d0211b6 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -27,7 +27,7 @@ <td class="right aligned"> <a class="ui primary show-panel button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.i18n.Tr "repo.settings.lfs_findcommits"}}</a> <button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}"> - <span class="btn-octicon btn-octicon-danger poping up" data-content="{{$.i18n.Tr "repo.editor.delete_this_file"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span> + <span class="btn-octicon btn-octicon-danger poping up" data-content="{{$.i18n.Tr "repo.editor.delete_this_file"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trash"}}</span> </button> </td> </tr> diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index b978a6a19c..7594230545 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -52,7 +52,7 @@ <a class="dont-break-out" href="{{$.BaseLink}}/{{.ID}}">{{.URL}}</a> <div class="ui right"> <span class="text blue px-2"><a href="{{$.BaseLink}}/{{.ID}}">{{svg "octicon-pencil"}}</a></span> - <span class="text red px-2"><a class="delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}}</a></span> + <span class="text red px-2"><a class="delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}}</a></span> </div> </div> {{end}} diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl index f775228ce0..099e9c651c 100644 --- a/templates/repo/settings/webhook/delete_modal.tmpl +++ b/templates/repo/settings/webhook/delete_modal.tmpl @@ -1,6 +1,6 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.settings.webhook_deletion"}} </div> <div class="content"> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 9beddfb912..be7d651777 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -55,9 +55,9 @@ <span class="btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil"}}</span> {{end}} {{if .CanDeleteFile}} - <a href="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><span class="btn-octicon btn-octicon-danger poping up" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span></a> + <a href="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><span class="btn-octicon btn-octicon-danger poping up" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trash"}}</span></a> {{else}} - <span class="btn-octicon poping up disabled" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span> + <span class="btn-octicon poping up disabled" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trash"}}</span> {{end}} {{end}} </div> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index afd7096377..0bc5858863 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -82,7 +82,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "repo.wiki.delete_page_button"}} </div> <div class="content"> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 92624fb24f..b9cf0ec1d2 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -98,7 +98,7 @@ {{else}} <a href="{{$.Link}}/{{.ID}}/close" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-x"}} {{$.i18n.Tr "repo.milestones.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Content}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 04ab539088..1a74c64d74 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -197,7 +197,7 @@ <div class="ui small basic delete modal" id="delete-email"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.email_deletion"}} </div> <div class="content"> @@ -208,7 +208,7 @@ <div class="ui small basic delete modal" id="delete-account"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.delete_account_title"}} </div> <div class="content"> diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 5f5f96d4eb..0455b5e221 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -15,7 +15,7 @@ <div class="item"> <div class="right floated content"> <button class="ui red tiny button delete-button" id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> - {{svg "octicon-trashcan" 16 "mr-2"}} + {{svg "octicon-trash" 16 "mr-2"}} {{$.i18n.Tr "settings.delete_token"}} </button> </div> @@ -56,7 +56,7 @@ <div class="ui small basic delete modal" id="delete-token"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.access_token_deletion"}} </div> <div class="content"> diff --git a/templates/user/settings/applications_oauth2.tmpl b/templates/user/settings/applications_oauth2.tmpl index 1796d2571c..4de3f27ec3 100644 --- a/templates/user/settings/applications_oauth2.tmpl +++ b/templates/user/settings/applications_oauth2.tmpl @@ -16,7 +16,7 @@ <button class="ui red tiny button delete-button" id="remove-gitea-oauth2-application" data-url="{{AppSubUrl}}/user/settings/applications/oauth2/delete" data-id="{{$app.ID}}"> - {{svg "octicon-trashcan" 16 "mr-2"}} + {{svg "octicon-trash" 16 "mr-2"}} {{$.i18n.Tr "settings.delete_key"}} </button> </div> @@ -49,7 +49,7 @@ <div class="ui small basic delete modal" id="remove-gitea-oauth2-application"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.remove_oauth2_application"}} </div> <div class="content"> diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl index 8ce82cbfcf..1f8c7f756e 100644 --- a/templates/user/settings/applications_oauth2_edit.tmpl +++ b/templates/user/settings/applications_oauth2_edit.tmpl @@ -56,7 +56,7 @@ <div class="ui small basic delete modal" id="delete-oauth2-application"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.remove_oauth2_application"}} </div> <div class="content"> diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 91658a15ee..69dbcced8c 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -59,7 +59,7 @@ <div class="ui small basic delete modal" id="delete-gpg"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.gpg_key_deletion"}} </div> <div class="content"> diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 26204b5b98..e8057c7cf3 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -56,7 +56,7 @@ <div class="ui small basic delete modal" id="delete-principal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.ssh_principal_deletion"}} </div> <div class="content"> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 95e95b0ddb..62e697ad19 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -63,7 +63,7 @@ <div class="ui small basic delete modal" id="delete-ssh"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.ssh_key_deletion"}} </div> <div class="content"> diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 5633b8cc32..453dce7278 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -142,7 +142,7 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.remove_account_link"}} </div> <div class="content"> diff --git a/templates/user/settings/security_accountlinks.tmpl b/templates/user/settings/security_accountlinks.tmpl index ba3962836c..9c2436dd3f 100644 --- a/templates/user/settings/security_accountlinks.tmpl +++ b/templates/user/settings/security_accountlinks.tmpl @@ -26,7 +26,7 @@ <div class="ui small basic delete modal" id="delete-account-link"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.remove_account_link"}} </div> <div class="content"> diff --git a/templates/user/settings/security_openid.tmpl b/templates/user/settings/security_openid.tmpl index 72442d45e1..9a807d850e 100644 --- a/templates/user/settings/security_openid.tmpl +++ b/templates/user/settings/security_openid.tmpl @@ -53,7 +53,7 @@ <div class="ui small basic delete modal" id="delete-openid"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.openid_deletion"}} </div> <div class="content"> diff --git a/templates/user/settings/security_twofa.tmpl b/templates/user/settings/security_twofa.tmpl index c877aebc32..860bfdf569 100644 --- a/templates/user/settings/security_twofa.tmpl +++ b/templates/user/settings/security_twofa.tmpl @@ -25,7 +25,7 @@ <div class="ui small basic delete modal" id="disable-twofa"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.twofa_disable"}} </div> <div class="content"> diff --git a/templates/user/settings/security_u2f.tmpl b/templates/user/settings/security_u2f.tmpl index 41bec78b70..6b8215f8d0 100644 --- a/templates/user/settings/security_u2f.tmpl +++ b/templates/user/settings/security_u2f.tmpl @@ -45,7 +45,7 @@ <div class="ui small basic delete modal" id="delete-registration"> <div class="ui icon header"> - {{svg "octicon-trashcan"}} + {{svg "octicon-trash"}} {{.i18n.Tr "settings.u2f_delete_key"}} </div> <div class="content"> |