diff --git a/app/app/styles/section/github.scss b/app/app/styles/section/github.scss index 0c275ff5..9eca5acb 100644 --- a/app/app/styles/section/github.scss +++ b/app/app/styles/section/github.scss @@ -40,107 +40,90 @@ } .section-github-render { - - h3 { - margin-bottom: 0px; - } - - h6 { - font-size: 18px; - margin: 0; - display: inline; - } - - h6 a { - color: inherit; - } - - p { - margin-top: 5px; - } - - .github-board { - margin-top: 30px; - } - - table { - margin-left: 0px!important; - border: none!important; - } - - thead.github th { - background-color: #f8f8f8; - text-align: left; - padding: 4px 30px; - font-family: "open_sanssemibold"; - border-bottom: 1px solid #e1e1e1 !important; - } - - tbody.github td { + .github-table { + margin: 0 !important; border: none !important; - padding: 8px 30px !important; - vertical-align: top; - } + line-height: 30px; - span.label-private { - font-weight: normal; - color: #4c4a42; - background-color: #ffefc6; - padding: 3px 4px; - font-size: 12px; - border-radius: 2px; - box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12); - line-height: 1; - margin-left: 10px; - } - - table.label-table { - margin-top:30px !important; - } - - table.milestone-table { - progress[value] { - background-color: #eeeeee; - border-radius: 3px; - height: 15px; - width: 50%; + td { + border: none !important; + vertical-align: top; } } - .github-issue-label { + .heading { + font-size: 1.6rem; + margin: 30px 0 0 0; + } + + .issue-label { font-size: 11px; - color: white; - padding: 0px 4px; + color: $color-white; + padding: 0px 8px; 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; + progress[value] { + background-color: $color-off-white; + border-radius: 3px; + height: 15px; + width: 150px; + } + + .progress-meta { + color: $color-gray; + font-size: 1rem; + font-family: "arial"; + } + + .contributor-name { + line-height: 15px; + } + + .milestone-name, .issue-name, .contributor-name { + font-size: 1.2rem; + } + + .milestone-symbol { + padding-top: 3px; + } + + .issue-symbol { + padding-top: 3px; + } + + .contributor-meta { + line-height: 30px; + } + + .milestone-meta, .issue-meta, .contributor-meta { + color: $color-gray; + font-size: 1rem; + } + + .github-avatar { + border-radius: 4px; + width: 36px; + height: 36px; } .branch { font-family: "open_sanssemibold"; } - .milestone { - font-size: 15px; - } - - .github-avatar { - border-radius: 4px; - } - + // span.label-private { + // font-weight: normal; + // color: #4c4a42; + // background-color: #ffefc6; + // padding: 3px 4px; + // font-size: 12px; + // border-radius: 2px; + // box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12); + // line-height: 1; + // margin-left: 10px; + // } } diff --git a/app/app/styles/view/document/wysiwyg.scss b/app/app/styles/view/document/wysiwyg.scss index d1d1af52..56874af7 100644 --- a/app/app/styles/view/document/wysiwyg.scss +++ b/app/app/styles/view/document/wysiwyg.scss @@ -1,7 +1,7 @@ .wysiwyg { // font-size: 1rem; font-size: 15px; - line-height: 30px; + line-height: 30px; color: #3c3c3c; table diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go index a092f732..704e5c24 100644 --- a/core/section/github/commits_template.go +++ b/core/section/github/commits_template.go @@ -13,81 +13,82 @@ package github const commitsTemplate = `
-{{if .HasAuthorStats}} -

Contributors

+ {{if .HasAuthorStats}} +
Contributors
+

+ There + {{if eq 1 .NumContributors}}is{{else}}are{{end}} + {{.NumContributors}} + {{if eq 1 .NumContributors}}contributor{{else}}contributors{{end}} + across {{.RepoCount}} + {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} +

-

- There - {{if eq 1 .NumContributors}}is{{else}}are{{end}} - {{.NumContributors}} - {{if eq 1 .NumContributors}}contributor{{else}}contributors{{end}} - across {{.RepoCount}} - {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} -

+
+ + + {{range $stats := .AuthorStats}} + + + + + {{end}} + +
+ @{{$stats.Author}} + +
{{$stats.Author}}
+
+ {{if gt $stats.OpenIssues 0}} + assigned {{$stats.OpenIssues}} + {{if eq 1 $stats.OpenIssues}} issue + {{else}} issues {{end}} + {{end}} + {{if gt $stats.ClosedIssues 0}} + · {{$stats.ClosedIssues}} closed + {{end}} + {{if gt $stats.CommitCount 0}} + {{if gt $stats.OpenIssues 0}} · {{end}} + {{if gt $stats.ClosedIssues 0}} · {{end}} + made {{$stats.CommitCount}} + {{if eq 1 $stats.CommitCount}} commit {{else}} commits {{end}} + on {{len $stats.Repos}} {{if eq 1 (len $stats.Repos)}} branch {{else}} branches {{end}} + {{range $repo := $stats.Repos}} · {{$repo}} {{end}} + {{end}} +
+
+
+ {{end}} - - - {{range $stats := .AuthorStats}} - - - - - - - {{end}} - -
- @{{$stats.Author}} - -
{{$stats.Author}}
- {{if gt $stats.OpenIssues 0}} - has been assigned {{$stats.OpenIssues}} - {{if eq 1 $stats.OpenIssues}} issue, - {{else}} issues, {{end}} - {{end}} - {{if gt $stats.ClosedIssues 0}} - {{$stats.ClosedIssues}} have been closed, - {{end}} - - {{if gt $stats.CommitCount 0}} - has made {{$stats.CommitCount}} - {{if eq 1 $stats.CommitCount}} commit {{else}} commits {{end}} - on {{len $stats.Repos}} {{if eq 1 (len $stats.Repos)}} branch. {{else}} branches. {{end}} -
- {{range $repo := $stats.Repos}} {{$repo}}, {{end}} - {{end}} -
-{{end}} - -{{if .HasCommits}} -

Commits

-

There are {{len .BranchCommits}} commits by {{.NumContributors}} contributors - across {{.RepoCount}} - {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} -

- - - {{range $commit := .BranchCommits}} - - - - - - {{end}} - -
- @{{$commit.Name}} - - {{if $commit.ShowUser}} -
{{$commit.Name}}
- {{end}} - {{$commit.Message}}
- {{if $commit.ShowDate}}{{$commit.Date}}{{end}} - 		- {{if $commit.ShowBranch}}{{$commit.Repo}}:{{$commit.Branch}}{{end}} -
-
-{{end}} + {{if .HasCommits}} +
Commits
+

There are {{len .BranchCommits}} commits by {{.NumContributors}} contributors across {{.RepoCount}} + {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}} +

+
+ + + {{range $commit := .BranchCommits}} + + + + + {{end}} + +
+ @{{$commit.Name}} + + {{if $commit.ShowUser}} +
{{$commit.Message}}
+ {{end}} +
+ {{$commit.Name}} + {{if $commit.ShowDate}} · {{$commit.Date}} {{end}} + {{if $commit.ShowBranch}} · {{$commit.Repo}}:{{$commit.Branch}}{{end}} +
+
+
+ {{end}}
` diff --git a/core/section/github/issues.go b/core/section/github/issues.go index cbbb9121..c41c5118 100644 --- a/core/section/github/issues.go +++ b/core/section/github/issues.go @@ -99,7 +99,7 @@ func wrapLabels(labels []gogithub.Label) (l string, labelNames []string, labelCo for _, ll := range labels { labelNames = append(labelNames, *ll.Name) labelColors = append(labelColors, *ll.Color) - l += `` + *ll.Name + ` ` + l += `` + *ll.Name + ` ` } return l, labelNames, labelColors } diff --git a/core/section/github/issues_template.go b/core/section/github/issues_template.go index 5c967694..e2377553 100644 --- a/core/section/github/issues_template.go +++ b/core/section/github/issues_template.go @@ -29,7 +29,7 @@ const ( issuesTemplate = `
{{if .HasIssues}} -

Issues

+
Issues

There are {{.ClosedIssues}} closed {{if eq 1 .ClosedIssues}}issue{{else}}issues{{end}} @@ -38,47 +38,31 @@ const ( across {{.RepoCount}} {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}

-

- {{if .ShowList}} - Including issues labelled - {{range $label := .List}} - {{if $label.Included}} - {{$label.Name}} - {{end}} + +

+ + + {{range $data := .Issues}} + + + + + {{end}} - {{end}} -

-
- -
+
+ {{if $data.IsOpen}} + ` + openIsvg + ` + {{else}} + ` + closedIsvg + ` + {{end}} +
+
+
{{$data.Message}}
+ #{{$data.ID}} · {{$data.Repo}} · {{$data.Milestone}} · {{$data.Creator}} opened on {{$data.Date}} +
{{$data.Labels}}
+
- - {{range $data := .Issues}} - - - - - - - - {{end}} - - +
-
- {{if $data.IsOpen}} - ` + openIsvg + ` - {{else}} - ` + closedIsvg + ` - {{end}} -
- 		-
{{$data.Message}} #{{$data.ID}}

- {{$data.Milestone}} {{$data.Labels}} - 		-
{{$data.Repo}}

- {{$data.Creator}} opened on {{$data.Date}} -
-
{{end}} ` diff --git a/core/section/github/milestones.go b/core/section/github/milestones.go index 63959d61..7572211e 100644 --- a/core/section/github/milestones.go +++ b/core/section/github/milestones.go @@ -111,7 +111,7 @@ func getMilestones(client *gogithub.Client, config *githubConfig) ([]githubMiles } } if include { - dd := "No due date." + 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) + "" diff --git a/core/section/github/milestones_template.go b/core/section/github/milestones_template.go index 9ff33bb8..41142121 100644 --- a/core/section/github/milestones_template.go +++ b/core/section/github/milestones_template.go @@ -28,10 +28,9 @@ const ( ` milestonesTemplate = ` - -
+
{{if .HasMilestones}} -

Milestones

+
Milestones

There are {{.ClosedMS}} @@ -41,40 +40,43 @@ const ( open across {{.RepoCount}} {{if eq 1 .RepoCount}} repository. {{else}} repositories. {{end}}

-
- - - {{range $data := .Milestones}} - -
- {{if $data.IsMilestone}} - {{if $data.IsOpen}} - ` + openMSsvg + ` - {{else}} - ` + closedMSsvg + ` +
+ + + {{range $data := .Milestones}} + + + + - - - - {{end}} + + + + + {{end}}
+
+ {{if $data.IsMilestone}} + {{if $data.IsOpen}} + ` + openMSsvg + ` + {{else}} + ` + closedMSsvg + ` + {{end}} + {{end}} +
+
+
{{$data.Name}}
+ {{$data.Repo}} + {{if $data.IsMilestone}} + · {{$data.DueDate}} {{end}} - {{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}} -
+ {{if $data.IsMilestone}} + +
{{$data.CompleteMsg}} complete    {{$data.OpenIssues}} open    {{$data.ClosedIssues}} closed
+ {{else}} +
{{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
+ {{end}} +
- {{end}} ` diff --git a/core/section/github/summary_template.go b/core/section/github/summary_template.go index 82dc3e1b..82d3abac 100644 --- a/core/section/github/summary_template.go +++ b/core/section/github/summary_template.go @@ -13,9 +13,7 @@ package github const summaryTemplate = `
- -

- Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories: +

Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories: {{range $data := .Config.Lists}} {{if $data.Included}} @@ -26,22 +24,21 @@ const summaryTemplate = `

{{if .HasSharedLabels}} -

Common Labels

+
Labels

There {{if eq 1 (len .SharedLabels)}} is {{else}} are {{end}} {{len .SharedLabels}} shared {{if eq 1 (len .SharedLabels)}} label {{else}} labels {{end}} across the repositories.

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