From 86fdba177ad82f3dcdfc237631fef4588042b9d6 Mon Sep 17 00:00:00 2001 From: John Olheiser <42128690+jolheiser@users.noreply.github.com> Date: Tue, 11 Feb 2020 11:02:41 -0600 Subject: Add Octicon SVG spritemap (#10107) * Add octicon SVG sprite Signed-off-by: jolheiser * Static prefix Signed-off-by: jolheiser * SVG for all repo icons Signed-off-by: jolheiser * make vendor Signed-off-by: jolheiser * Swap out octicons Signed-off-by: jolheiser * Move octicons to top of less imports Signed-off-by: jolheiser * Fix JS Signed-off-by: jolheiser * Definitely not a search/replace Signed-off-by: jolheiser * Missed regex Signed-off-by: jolheiser * Move to more generic calls and webpack Signed-off-by: jolheiser * make svg -> make webpack Signed-off-by: jolheiser * Remove svg-sprite Signed-off-by: jolheiser * Update tests Signed-off-by: jolheiser * Missed a test Signed-off-by: jolheiser * Remove svg from makefile Signed-off-by: jolheiser * Suggestions Signed-off-by: jolheiser * Attempt to fix test Signed-off-by: jolheiser * Update tests Signed-off-by: jolheiser * Revert timetracking test Signed-off-by: jolheiser * Swap .octicon for .svg in less Signed-off-by: jolheiser * Add aria-hidden Signed-off-by: jolheiser * Replace mega-octicon Signed-off-by: jolheiser * Fix webpack globbing on Windows Signed-off-by: jolheiser * Revert Co-Authored-By: silverwind * Fix octions from upstream Signed-off-by: jolheiser * Fix Vue and missed JS function Signed-off-by: jolheiser * Add JS helper and PWA Signed-off-by: jolheiser * Preload SVG Signed-off-by: jolheiser Co-authored-by: silverwind Co-authored-by: techknowlogick --- templates/user/dashboard/issues.tmpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'templates/user/dashboard/issues.tmpl') diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index c8cc8b09df..dfb94560e5 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -54,11 +54,11 @@
@@ -110,10 +110,10 @@ {{end}} {{if .NumComments}} - {{.NumComments}} + {{svg "octicon-comment" 16}} {{.NumComments}} {{end}} {{if .TotalTrackedTime}} - {{.TotalTrackedTime | Sec2Time}} + {{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}} {{end}}

@@ -126,12 +126,12 @@ {{end}} {{if .Milestone}} - {{.Milestone.Name}} + {{svg "octicon-milestone" 16}} {{.Milestone.Name}} {{end}} {{if .Ref}} - {{.Ref}} + {{svg "octicon-git-branch" 16}} {{.Ref}} {{end}} {{range .Assignees}} @@ -143,17 +143,17 @@ {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} - {{$tasksDone}} / {{$tasks}} + {{svg "octicon-checklist" 16}} {{$tasksDone}} / {{$tasks}} {{end}} {{if ne .DeadlineUnix 0}} - {{.DeadlineUnix.FormatShort}} + {{svg "octicon-calendar" 16}}{{.DeadlineUnix.FormatShort}} {{end}} {{if .IsPull}} {{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}} - {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}} + {{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)}} {{end}} {{end}}

-- cgit v1.2.3