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/settings | |
| 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/settings')
| -rw-r--r-- | templates/repo/settings/githooks.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/settings/protected_branch.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/settings/webhook/list.tmpl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index 99a38cb800..ace47ad7b9 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -14,7 +14,7 @@ </div> {{range .Hooks}} <div class="item"> - <span class="text {{if .IsActive}}green{{else}}grey{{end}}">{{svg "octicon-primitive-dot" 16}}</span> + <span class="text {{if .IsActive}}green{{else}}grey{{end}}">{{svg "octicon-dot-fill" 16}}</span> <span>{{.Name}}</span> <a class="text blue ui right" href="{{$.RepoLink}}/settings/hooks/git/{{.Name}}"><i class="fa fa-pencil"></i></a> </div> diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 0496eb189d..e65ab82421 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -65,7 +65,7 @@ <div class="menu"> {{range .Teams}} <div class="item" data-value="{{.ID}}"> - {{svg "octicon-jersey" 16}} + {{svg "octicon-people" 16}} {{.Name}} </div> {{end}} @@ -115,7 +115,7 @@ <div class="menu"> {{range .Teams}} <div class="item" data-value="{{.ID}}"> - {{svg "octicon-jersey" 16}} + {{svg "octicon-people" 16}} {{.Name}} </div> {{end}} @@ -195,7 +195,7 @@ <div class="menu"> {{range .Teams}} <div class="item" data-value="{{.ID}}"> - {{svg "octicon-jersey" 16}} + {{svg "octicon-people" 16}} {{.Name}} </div> {{end}} diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl index 417d16ce30..dcc27baa61 100644 --- a/templates/repo/settings/webhook/list.tmpl +++ b/templates/repo/settings/webhook/list.tmpl @@ -48,7 +48,7 @@ {{else if eq .LastStatus 2}} <span class="text red">{{svg "octicon-alert" 16}}</span> {{else}} - <span class="text grey">{{svg "octicon-primitive-dot" 16}}</span> + <span class="text grey">{{svg "octicon-dot-fill" 16}}</span> {{end}} <a class="dont-break-out" href="{{$.BaseLink}}/{{.ID}}">{{.URL}}</a> <div class="ui right"> |