diff options
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/settings/repos.tmpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index ed830998ac..c3e8f23761 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -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> diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index d28f067fdd..ed93dd1e42 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -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}} |