diff --git a/app/app/styles/section/github.scss b/app/app/styles/section/github.scss index 3bca74b2..ea361f73 100644 --- a/app/app/styles/section/github.scss +++ b/app/app/styles/section/github.scss @@ -45,8 +45,18 @@ margin-bottom: 0px; } + h6 { + font-size: 18px; + margin: 0; + display: inline; + } + + h6 a { + color: inherit; + } + p { - margin: 0px; + margin-top: 5px; } .github-board { @@ -68,7 +78,7 @@ tbody.github td { border: none !important; - padding: 15px 30px !important; + padding: 8px 30px !important; } span.label-private { @@ -88,12 +98,49 @@ } table.milestone-table { - + progress[value] { + background-color: #eeeeee; + border-radius: 3px; + height: 10px; + width: 50%; + } } + .github-issue-label { + font-size: 11px; + color: white; + padding: 0px 4px; + margin-right: 5px; + border-radius: 2px; + box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12); + display: inline-block; + line-height: 22px; + } + .date-meta { + color: #767676; + font-size: 13px; + } + .dataid { + color: #767676; + font-size: 13px; + } + .repo { + font-size: 16px; + } + .branch { + font-family: "open_sanssemibold"; + } + + .milestone { + font-size: 15px; + } + + .github-avatar { + border-radius: 4px; + } } @@ -122,39 +169,11 @@ margin-right: 10px; } - progress[value] { - background-color: #eeeeee; - border-radius: 3px; - height: 10px; - width: 50%; - } table.contributor-table { margin-top: 30px !important; } - .github-avatar { - float: left; - margin-right: 20px; - } - - .github-avatar img { - border-radius: 4px; - } - - .github-issue-label { - font-size: 11px; - color: white; - padding: 0px 4px; - margin-right: 5px; - border-radius: 2px; - box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12); - display: inline-block; - line-height: 22px; - } - - - table.issue-table td a.link { font-size: 18px; } diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go index bd27dc43..351b1233 100644 --- a/core/section/github/commits_template.go +++ b/core/section/github/commits_template.go @@ -18,24 +18,24 @@ const commitsTemplate = `
- There + There {{if eq 1 (len .AuthorStats)}}is{{else}}are{{end}} {{len .AuthorStats}} {{if eq 1 (len .AuthorStats)}}contributor{{else}}contributors{{end}} - across {{.RepoCount}} + across {{.RepoCount}} {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}
-
- |
+ |
- - {{$stats.Author}} has been assigned {{$stats.OpenIssues}} issues, {{$stats.ClosedIssues}} are now closed, has made {{$stats.CommitCount}} commit on 6 branches. + |
+ {{$stats.Author}}has been assigned {{$stats.OpenIssues}} issues, {{$stats.ClosedIssues}} are now closed, has made {{$stats.CommitCount}} commit on 6 branches.{{range $repo := $stats.Repos}} {{$repo}}, {{end}} |
@@ -48,32 +48,26 @@ const commitsTemplate = `
{{if .HasCommits}}
Contributor | -Commits / Date | -Repository:Branch | -
---|
+ |
+ |
+
{{if $commit.ShowUser}}
-
-
- {{$commit.Name}}
+ {{$commit.Name}}{{end}} |
- + |
{{$commit.Message}} |
- {{if $commit.ShowBranch}}{{$commit.Repo}}:{{$commit.Branch}}{{end}} | +{{if $commit.ShowBranch}}{{$commit.Repo}}:{{$commit.Branch}}{{end}} |
+ |
{{if $data.IsOpen}}
` + openIsvg + `
@@ -62,18 +66,14 @@ const (
|
- - {{$data.Message}} - {{$data.Milestone}} {{$data.Labels}} + |
+ {{$data.Message}} #{{$data.ID}}+ {{$data.Milestone}} {{$data.Labels}} |
-
- {{$data.Repo}}
-
-
+
- |
+ {{$data.Repo}}+ |
|
+ | {{if $data.IsMilestone}} {{if $data.IsOpen}} ` + openMSsvg + ` @@ -55,14 +55,14 @@ const ( {{end}} {{end}} | -- {{$data.Name}} + |
+ {{$data.Name}}{{if $data.IsMilestone}} {{end}}- {{$data.Repo}} + {{$data.Repo}} |
- + |
{{if $data.IsMilestone}}
{{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed diff --git a/core/section/github/summary_template.go b/core/section/github/summary_template.go index 545e3786..fc0aa2fa 100644 --- a/core/section/github/summary_template.go +++ b/core/section/github/summary_template.go @@ -27,10 +27,10 @@ const summaryTemplate = ` {{if .HasSharedLabels}} Common Labels-There + There {{if eq 1 (len .SharedLabels)}} is {{else}} are {{end}} {{len .SharedLabels}} - shared + shared {{if eq 1 (len .SharedLabels)}} label {{else}} labels {{end}} across the repositories.
|