diff --git a/web/beads.go b/web/beads.go index 3fa9f7d51367fe7c47056301eeb42e470b8685f0..a18ef42270d6168d2b49f86bb8bd7b6d0261ed91 100644 --- a/web/beads.go +++ b/web/beads.go @@ -274,10 +274,14 @@ data := &BeadsData{ Mode: "board", Lanes: []BeadsLane{ - {Name: "Rolling", Slug: "rolling", Accent: "#f5c518", Issues: rolling}, - {Name: "Lined Up", Slug: "lined-up", Accent: "#2e9e4f", Issues: linedUp}, - {Name: "Stalled", Slug: "stalled", Accent: "#7b2ff7", Issues: stalled}, - {Name: "Past Stand", Slug: "past-stand", Accent: "#8a8d91", Issues: pastStand}, + // Accents are muted Mardi Gras hues (gold / green / violet / gray) + // chosen to read on both the light and dark SourceHut themes. They + // are applied by the template as thin accents (card border, lane + // underline, tinted chips), never as body text, so contrast holds. + {Name: "Rolling", Slug: "rolling", Accent: "#c9930a", Issues: rolling}, + {Name: "Lined Up", Slug: "lined-up", Accent: "#2f9e44", Issues: linedUp}, + {Name: "Stalled", Slug: "stalled", Accent: "#9c36b5", Issues: stalled}, + {Name: "Past Stand", Slug: "past-stand", Accent: "#868e96", Issues: pastStand}, }, Counts: BeadsCounts{ Rolling: len(rolling), @@ -473,11 +477,11 @@ // needs the blocked signal). func laneForCategory(cat string) (name, accent string) { switch cat { case "closed": - return "Past Stand", "#8a8d91" + return "Past Stand", "#868e96" case "in_progress": - return "Rolling", "#f5c518" + return "Rolling", "#c9930a" default: - return "Lined Up", "#2e9e4f" + return "Lined Up", "#2f9e44" } } diff --git a/web/templates/beads.html b/web/templates/beads.html index d2bbbef485c8f94478f773f3218b08617d3eeae9..d58eb143b45b53bdd74fed945d929063a5ebde31 100644 --- a/web/templates/beads.html +++ b/web/templates/beads.html @@ -1,81 +1,113 @@ {{define "content" -}} +

~{{.Repo.OwnerName}}/{{.Repo.Name}} · parade

{{template "viewtabs" (dict "Repo" .Repo "Views" .Views "Current" "beads" "Ref" .Ref)}} @@ -86,12 +118,12 @@ {{with .Data.Issue}}

{{.ID}} {{.Title}} - {{.Lane}} + {{.Lane}}

status: {{.Status}} {{if .Priority}}P{{.Priority}}{{end}} - {{if .IssueType}}{{.IssueType}}{{end}} + {{if .IssueType}}{{.IssueType}}{{end}} {{if .Assignee}}@{{.Assignee}}{{end}} {{range .Labels}}{{.}}{{end}}
@@ -162,30 +194,28 @@
Showing the first {{.Data.Total}} of {{.Data.ShownOf}} issues.
{{end}}
-
{{.Data.Counts.Rolling}}Rolling
-
{{.Data.Counts.LinedUp}}Lined Up
-
{{.Data.Counts.Stalled}}Stalled
-
{{.Data.Counts.PastStand}}Past Stand
+
{{.Data.Counts.Rolling}}Rolling
+
{{.Data.Counts.LinedUp}}Lined Up
+
{{.Data.Counts.Stalled}}Stalled
+
{{.Data.Counts.PastStand}}Past Stand
{{.Data.Counts.Total}}Total