tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Update Octicons to v10 (#12240)

Browse Source 
* 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>
This commit is contained in:
silverwind
2020-07-17 17:15:12 +02:00
committed by GitHub
parent 4fa2e217c1
commit 0e24af6951
267 changed files with 263 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/user/dashboard/issues.tmpl
View File

@@ -179,7 +179,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}}
@@ -191,7 +191,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>

2
templates/user/settings/repos.tmpl
View File

@@ -17,7 +17,7 @@
{{else if .IsFork}}
<span class="iconFloat">{{svg "octicon-repo-forked" 16}}</span>
{{else if .IsMirror}}
<span class="iconFloat">{{svg "octicon-repo-clone" 16}}</span>
<span class="iconFloat">{{svg "octicon-mirror" 16}}</span>
{{else}}
<span class="iconFloat">{{svg "octicon-repo" 16}}</span>
{{end}}