diff options
| author | silverwind <me@silverwind.io> | 2020-07-17 17:15:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 18:15:12 +0300 |
| commit | 0e24af6951fa65d5094ab6da0f182697aab2a6f0 (patch) | |
| tree | df34876b8999a641267a09da3eee5f613b681b42 /templates/repo/issue/list.tmpl | |
| parent | 4fa2e217c171ab321e1c0322f48d70d327e8f596 (diff) | |
| download | gitea-0e24af6951fa65d5094ab6da0f182697aab2a6f0.tar.gz gitea-0e24af6951fa65d5094ab6da0f182697aab2a6f0.zip | |
Update Octicons to v10 (#12240)
* Update Octicons to v10
Besides a few renames, these icons are no longer present in v10 that we've
used, so had to change:
file-symlink-directory -> file-submodule
internal-repo -> repo
repo-force-push -> repo-push
repo-template-private -> repo-template
Fixes: https://github.com/go-gitea/gitea/issues/11889
Ref: https://github.com/primer/octicons/releases/tag/v10.0.0
* add custom sliders svg for removed octicon-settings
* apply suggestion
* fix triangles and use play on admin dashboard
* add custom mirror svg
* add missing build files
* unify custom svgs
* move to octicon-repo-clone to gitea-mirror
* use octicon-x on conflicts
* tweak timeline icons
* tweak comment buttons
* update settings icon to octicons v1
* switch to octicon-mirror and octicon-tools
* replace two wiki buttons with octicons
* remove whitespace in svg sources
* Fix filepath basename on Windows for SVG bindata (#12241)
* move octicons to devDependencies
* move back to dependencies
* move svgo to devDependencies again
Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates/repo/issue/list.tmpl')
| -rw-r--r-- | templates/repo/issue/list.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index f64de74e85..ffc952c8b3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -279,7 +279,7 @@ {{end}} {{if gt $rejectOfficial 0}} - <span class="rejects">{{svg "octicon-request-changes" 16}} + <span class="rejects">{{svg "octicon-diff" 16}} {{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}} </span> {{end}} @@ -291,7 +291,7 @@ {{end}} {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} - <span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> + <span class="conflicting">{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} </p> |