diff --git a/app/app/styles/section/github.scss b/app/app/styles/section/github.scss index 1f617a51..5f6330ff 100644 --- a/app/app/styles/section/github.scss +++ b/app/app/styles/section/github.scss @@ -42,11 +42,19 @@ .section-github-render { h3 { - margin: 40px 0; + margin-bottom: 0px; + } + + p { + margin: 0px; + } + + .github-board { + margin-top: 30px; } table { - margin: 0px!important; + margin-left: 0px!important; } thead.github th { @@ -63,6 +71,18 @@ padding: 15px 30px !important; } + 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.milestone-table { td a.link { font-size: 18px; @@ -73,6 +93,18 @@ font-size: 18px; } + td span.date-meta { + margin-right: 10px; + font-size: 14px; + color: #767676; + + img { + height: 14px; + margin-right: 10px; + } + + } + progress[value] { background-color: #eeeeee; border-radius: 3px; @@ -81,6 +113,10 @@ } } + table.contributor-table { + margin-top: 30px !important; + } + .github-avatar { float: left; margin-right: 20px; @@ -108,7 +144,7 @@ td span.milestone { color: #3c3c3c; - font-size: 18px; + font-size: 15px; } li.github-commit-item { diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go index eb9c36e6..65886ba0 100644 --- a/core/section/github/commits_template.go +++ b/core/section/github/commits_template.go @@ -16,7 +16,7 @@ const commitsTemplate = ` {{if .HasAuthorStats}} -

Contributor activity since {{.Config.Since}}{{.Config.DateMessage}}

+

Contributor activity

@@ -50,24 +50,21 @@ const commitsTemplate = ` {{end}} {{if .HasCommits}} -

Commits activity since {{.Config.Since}}{{.Config.DateMessage}}

+

Commits activity

- - - + + {{range $commit := .BranchCommits}} - - - - + + {{end}} diff --git a/core/section/github/issues_template.go b/core/section/github/issues_template.go index 4e76e586..f260add8 100644 --- a/core/section/github/issues_template.go +++ b/core/section/github/issues_template.go @@ -25,7 +25,8 @@ const ( issuesTemplate = `
{{if .HasIssues}} -

Issues: {{.ClosedIssues}} closed, {{.OpenIssues}} open

+

Issues

+

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

{{if .ShowList}} Including issues labelled @@ -43,35 +44,36 @@ const (

Repository:BranchDate ContributorCommitsCommits / DateRepository:Branch
{{if $commit.ShowBranch}}{{$commit.Repo}}:{{$commit.Branch}}{{end}}{{if $commit.ShowDate}}{{$commit.Date}}{{end}} + {{if $commit.ShowUser}}
@{{$commit.Name}} @@ -75,7 +72,11 @@ const commitsTemplate = ` {{$commit.Name}} {{end}}
{{$commit.Message}} + {{$commit.Message}}
+ {{if $commit.ShowDate}}{{$commit.Date}}{{end}} +
{{if $commit.ShowBranch}}{{$commit.Repo}}:{{$commit.Branch}}{{end}}
- - - + + {{range $data := .Issues}} - - - + {{end}} diff --git a/core/section/github/milestones_template.go b/core/section/github/milestones_template.go index 01ecc178..0ac597e3 100644 --- a/core/section/github/milestones_template.go +++ b/core/section/github/milestones_template.go @@ -31,14 +31,15 @@ const (
{{if .HasMilestones}} -

Milestones: {{.ClosedMS}} closed, {{.OpenMS}} open

+

Milestones

+

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

RepositoryMilestoneIssuesRepository / MilestoneIssues
{{$data.Repo}} {{if $data.Private}}(Private){{end}}{{$data.Milestone}} -
  • - -
    - {{if $data.IsOpen}} - ` + openIsvg + ` - {{else}} - ` + closedIsvg + ` - {{end}} -
    -
    -
    {{$data.Message}} {{$data.Labels}}
    -
    - #{{$data.ID}} opened on {{$data.Date}} by {{$data.Name}}, last updated {{$data.Updated}} +
  • + {{$data.Repo}}{{if $data.Private}}Private{{end}}
    + {{$data.Milestone}} +
    +
  • + +
    + {{if $data.IsOpen}} + ` + openIsvg + ` + {{else}} + ` + closedIsvg + ` + {{end}}
    - -
    -
  • +
    +
    {{$data.Message}} {{$data.Labels}}
    +
    + #{{$data.ID}} opened on {{$data.Date}} by {{$data.Name}}, last updated {{$data.Updated}} +
    +
    + +
    - + @@ -46,13 +47,18 @@ const ( {{range $data := .Milestones}} - - + - -
    Repository MilestoneIssue ProgressProgress
    {{$data.Repo}} {{if $data.Private}}(Private){{end}}{{$data.Name}}
    +
    + {{$data.Repo}} + {{if $data.Private}}Private{{end}} + + {{$data.Name}}
    {{if $data.IsMilestone}} - {{$data.DueDate}} Last UpdatedLast updated {{$data.UpdatedAt}} + {{$data.DueDate}} + Last UpdatedLast updated {{$data.UpdatedAt}} {{end}}
    + {{if $data.IsMilestone}}
    {{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed @@ -60,7 +66,7 @@ const ( {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed {{end}}
    + {{if $data.IsOpen}} ` + openMSsvg + ` {{else}} diff --git a/core/section/github/summary_template.go b/core/section/github/summary_template.go index 9cca04d2..3bccce54 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,11 +23,11 @@ const summaryTemplate = ` {{end}} {{end}} -
    + {{if .HasSharedLabels}}

    - Common Labels:
    + Common Labels