diff --git a/app/app/styles/section/github.scss b/app/app/styles/section/github.scss index 5158b846..3bca74b2 100644 --- a/app/app/styles/section/github.scss +++ b/app/app/styles/section/github.scss @@ -42,7 +42,7 @@ .section-github-render { h3 { - margin-bottom: 0px; + margin-bottom: 0px; } p { @@ -55,6 +55,7 @@ table { margin-left: 0px!important; + border: none!important; } thead.github th { @@ -67,8 +68,7 @@ tbody.github td { border: none !important; - border-bottom: 1px solid #e1e1e1 !important; - padding: 15px 30px !important; + padding: 15px 30px !important; } span.label-private { @@ -88,33 +88,45 @@ } table.milestone-table { - td a.link { + + } + + + + + +} + +/* + + + + + + table.milestone-table td a.link { font-size: 18px; } - td span.milestone { + td span.milestone { color: #3c3c3c; font-size: 18px; } - td span.date-meta { + td span.date-meta { margin-right: 10px; font-size: 14px; color: #767676; - - img { - height: 14px; - margin-right: 10px; - } - + } + td span.date-meta img { + height: 14px; + margin-right: 10px; } - progress[value] { + progress[value] { background-color: #eeeeee; border-radius: 3px; height: 10px; width: 50%; - } } table.contributor-table { @@ -141,8 +153,9 @@ line-height: 22px; } - table.issue-table { - td a.link { + + + table.issue-table td a.link { font-size: 18px; } @@ -204,6 +217,4 @@ } } } - } - } -} +*/ diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go index 65886ba0..59f1021b 100644 --- a/core/section/github/commits_template.go +++ b/core/section/github/commits_template.go @@ -16,33 +16,23 @@ const commitsTemplate = ` {{if .HasAuthorStats}} -

Contributor activity

+

Contributors

+

There are 3 contributors across 6 repositories.

- - - - - - - - {{range $stats := .AuthorStats}} - - - - + {{end}} @@ -50,7 +40,7 @@ const commitsTemplate = ` {{end}} {{if .HasCommits}} -

Commits activity

+

Commits

ContributorAssigned/Closed#CommitsBranches
-
- @{{$stats.Author}} -
- {{$stats.Author}} + 		+ @{{$stats.Author}} {{$stats.OpenIssues}} / {{$stats.ClosedIssues}}{{$stats.CommitCount}} - {{range $repo := $stats.Repos}} - {{$repo}}
- {{end}} + + 		+ {{$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}}
diff --git a/core/section/github/issues_template.go b/core/section/github/issues_template.go index fef77d32..c04214a3 100644 --- a/core/section/github/issues_template.go +++ b/core/section/github/issues_template.go @@ -14,14 +14,14 @@ package github const ( openIsvg = ` - + ` closedIsvg = ` - + @@ -30,7 +30,7 @@ const (
{{if .HasIssues}}

Issues

-

There are {{.ClosedIssues}} closed and {{.OpenIssues}} open

+

There are {{.ClosedIssues}} closed and {{.OpenIssues}} open across 6 repositories.

{{if .ShowList}} Including issues labelled @@ -46,38 +46,31 @@ const (

- - - - - - - {{range $data := .Issues}} - - + + {{end}} diff --git a/core/section/github/milestones.go b/core/section/github/milestones.go index 7f03f3bf..b382f222 100644 --- a/core/section/github/milestones.go +++ b/core/section/github/milestones.go @@ -114,7 +114,7 @@ func getMilestones(client *gogithub.Client, config *githubConfig) ([]githubMiles dd := "No due date." if v.DueOn != nil { // TODO refactor to add message in red if the milestone is overdue - dd = "Due on " + (*v.DueOn).Format(milestonesTimeFormat) + "." + dd = "due on " + (*v.DueOn).Format(milestonesTimeFormat) + "" } up := "" if v.UpdatedAt != nil { diff --git a/core/section/github/milestones_template.go b/core/section/github/milestones_template.go index 51614eb6..ce940412 100644 --- a/core/section/github/milestones_template.go +++ b/core/section/github/milestones_template.go @@ -32,40 +32,12 @@ const ( {{if .HasMilestones}}

Milestones

-

There are {{.ClosedMS}} closed and {{.OpenMS}} open

+

There is {{.ClosedMS}} milestone closed and {{.OpenMS}} milestone open across #number repositories.

Repository / MilestoneIssues
- {{$data.Repo}}{{if $data.Private}}Private{{end}}
- {{$data.Milestone}} + 		+
+ {{if $data.IsOpen}} + ` + openIsvg + ` + {{else}} + ` + closedIsvg + ` + {{end}} +
-
  • - -
    - {{if $data.IsOpen}} - ` + openIsvg + ` - {{else}} - ` + closedIsvg + ` - {{end}} + +
    		• + {{$data.Message}}
    + {{$data.Milestone}} {{$data.Labels}} +     		+ {{$data.Repo}} +
    +
    + #{{$data.ID}} opened on {{$data.Date}} by {{$data.Name}}
    -
    -
    {{$data.Message}} {{$data.Labels}}
    -
    - #{{$data.ID}} opened on {{$data.Date}} by {{$data.Name}}, last updated {{$data.Updated}} -
    -
    - - +
    - - - - - - - - - {{range $data := .Milestones}} - - - + + {{end}} diff --git a/core/section/github/summary_template.go b/core/section/github/summary_template.go index 3bccce54..dd87760c 100644 --- a/core/section/github/summary_template.go +++ b/core/section/github/summary_template.go @@ -14,7 +14,7 @@ package github const summaryTemplate = `
    -
    +

    Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories: {{range $data := .Config.Lists}} {{if $data.Included}} @@ -23,28 +23,16 @@ const summaryTemplate = ` {{end}} {{end}} -

    +

    {{if .HasSharedLabels}} -

    - Common Labels
    -

    - -
    RepositoryMilestoneProgress
    - {{$data.Repo}} - {{if $data.Private}}Private{{end}} - - {{$data.Name}}
    - {{if $data.IsMilestone}} - {{$data.DueDate}} - Last UpdatedLast updated {{$data.UpdatedAt}} - {{end}} -     		- {{if $data.IsMilestone}} -
    - {{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed - {{else}} - {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed - {{end}} -     		{{if $data.IsOpen}} ` + openMSsvg + ` @@ -73,6 +45,21 @@ const ( ` + closedMSsvg + ` {{end}} + {{$data.Name}} + {{if $data.IsMilestone}} + {{$data.DueDate}} + {{end}}
    + {{$data.Repo}} +     		+ {{if $data.IsMilestone}} +
    + {{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed + {{else}} + {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed + {{end}} +
    - - - - - - - - +

    Common Labels

    +

    There is 1 shared label across the repositories.

    +
    LabelCountRepositories
    {{range $slabel := .SharedLabels}} - - - + {{end}}
    {{$slabel.Name}}{{$slabel.Count}}{{$slabel.Repos}}{{$slabel.Name}} ({{$slabel.Count}}) in {{$slabel.Repos}}