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/view_content | |
| 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/view_content')
4 files changed, 6 insertions, 7 deletions
diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index e061560138..2873102afb 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,7 +1,6 @@ {{if .ctx.IsSigned}} <div class="item action ui pointing top right select-reaction dropdown" data-action-url="{{ .ActionURL }}"> <a class="add-reaction"> - {{svg "octicon-plus-small" 16}} {{svg "octicon-smiley" 16}} </a> <div class="menu"> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b3ef258a6c..8e7829bf7c 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -70,7 +70,7 @@ </div> {{else if eq .Type 1}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-primitive-dot" 16}}</span> + <span class="badge">{{svg "octicon-dot-fill" 16}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -319,7 +319,7 @@ </div> {{else if eq .Type 19}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-dependent" 16}}</span> + <span class="badge">{{svg "octicon-package-dependents" 16}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -344,7 +344,7 @@ </div> {{else if eq .Type 20}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-dependent" 16}}</span> + <span class="badge">{{svg "octicon-package-dependents" 16}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -603,7 +603,7 @@ </div> {{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-repo-force-push" 16}}</span> + <span class="badge">{{svg "octicon-repo-push" 16}}</span> <span class="text grey"> <a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{ if .IsForcePush }} diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index a7d3e0d26a..f26dd9e845 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -1,7 +1,7 @@ {{if .ctx.IsSigned}} <div class="item action ui pointing top right custom dropdown context-dropdown"> <a class="context-menu"> - <i class="fa fa-ellipsis-h"></i> + {{svg "octicon-kebab-horizontal" 16}} </a> <div class="menu"> {{if .diff}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index dc897bd7b9..c2b9cb36b9 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -173,7 +173,7 @@ {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .RequireSigned) .WillSign)}} {{if $notAllOverridableChecksOk}} <div class="item text yellow"> - <i class="icon icon-octicon">{{svg "octicon-primitive-dot" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-dot-fill" 16}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_administrator"}} </div> {{else}} |