summaryrefslogtreecommitdiffstats
path: root/templates/repo/branch
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/branch
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/branch')
-rw-r--r--templates/repo/branch/list.tmpl4
1 files changed, 2 insertions, 2 deletions
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">