summaryrefslogtreecommitdiffstats
path: root/templates/repo/settings
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2021-03-22 05:04:19 +0100
committerGitHub <noreply@github.com>2021-03-22 05:04:19 +0100
commit1a03fa7a4f353eb2f965cdcac39f630c281eca1e (patch)
tree042e54d01f25afff9f78c38cdc3d1c2da062118f /templates/repo/settings
parenta587a284349e7c27d1bec39ef0dedb3972ef68c5 (diff)
downloadgitea-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/repo/settings')
-rw-r--r--templates/repo/settings/collaboration.tmpl2
-rw-r--r--templates/repo/settings/deploy_keys.tmpl2
-rw-r--r--templates/repo/settings/lfs.tmpl2
-rw-r--r--templates/repo/settings/webhook/base_list.tmpl2
-rw-r--r--templates/repo/settings/webhook/delete_modal.tmpl2
5 files changed, 5 insertions, 5 deletions
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">