diff --git a/app/app/styles/base.scss b/app/app/styles/base.scss index df90c265..e3e1d8a0 100644 --- a/app/app/styles/base.scss +++ b/app/app/styles/base.scss @@ -35,6 +35,8 @@ html { background-color: $color-white; font-size: 14px; height: 100%; + -webkit-font-smoothing: antialiased; + text-shadow: 1px 1px 1px rgba(0,0,0,0.004); } body { @@ -46,6 +48,8 @@ a { color: $color-link; text-decoration: none; cursor: pointer; + -webkit-font-smoothing: antialiased; + text-shadow: 1px 1px 1px rgba(0,0,0,0.004); a:hover, a:focus { text-decoration: underline; diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index ec8e9650..a444b4c4 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -24,7 +24,7 @@ $color-header: #f3f5f8; $color-link: #0092d3; $color-border: #e1e1e1; -$color-input: #a1a1a1; +$color-input: #5a5a5a; $color-stroke: #e1e1e1; $color-tooltip: #a1a1a1; diff --git a/app/app/styles/font.scss b/app/app/styles/font.scss index 5d5c9b5a..7c6cce5b 100644 --- a/app/app/styles/font.scss +++ b/app/app/styles/font.scss @@ -1,8 +1,3 @@ -html, html a { - -webkit-font-smoothing: antialiased; - text-shadow: 1px 1px 1px rgba(0,0,0,0.004); -} - .fixed-width-font { font-family: 'courier new', courier; } diff --git a/app/app/styles/section/github.scss b/app/app/styles/section/github.scss index 887debb5..f3333a40 100644 --- a/app/app/styles/section/github.scss +++ b/app/app/styles/section/github.scss @@ -1,4 +1,8 @@ .section-github-editor { + .github-view label { + margin: 0 10px; + } + .github-repo { width: 100%; padding: 10px; @@ -46,7 +50,7 @@ } .github-table { - margin: 0 !important; + margin: 10px 0 !important; border: none !important; line-height: 30px; @@ -76,11 +80,15 @@ .github-table tbody tr td { border: none!important; - padding-left: 20px!important; - padding-bottom: 0!important; + padding: 5px 20px 5px 20px !important; } - span.dataid { + .github-table .right-column { + text-align: right; + color:#838d94; + } + + span.data { color:#838d94; } @@ -93,11 +101,18 @@ margin-left: 10px; } - progress[value] { - background-color: $color-off-white; - border-radius: 3px; - height: 15px; - width: 150px; + .progress-bar { + display: inline-block; border-radius: 3px; + width: 40%; + background-color: #f1f1f1; + height: 8px; + margin-left: 10px; + + .progress { + height: 8px; + border-radius: 4px; + background-color: #4caf50; + } } span.issue-state { diff --git a/app/app/styles/section/trello.scss b/app/app/styles/section/trello.scss index 235dfe90..5bbc380b 100644 --- a/app/app/styles/section/trello.scss +++ b/app/app/styles/section/trello.scss @@ -60,20 +60,12 @@ .heading { - a { - color: #3c3c3c!important; - } - h3 { font-size: 22px; margin: 0; font-family: "open_sanslight"; } - p { - font-size: 15px; - line-height: 0; - } } table.trello-single-board { @@ -96,8 +88,7 @@ .trello-single-board tbody tr td { border: none!important; - padding-left: 20px!important; - padding-bottom: 0!important; + padding: 5px 20px 5px 20px !important; } .trello-label { @@ -106,7 +97,7 @@ padding: 4px 6px; border-radius: 4px; box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.12); - margin-left: 10px; + margin-left: 14px; } } diff --git a/app/app/templates/components/section/github/type-editor.hbs b/app/app/templates/components/section/github/type-editor.hbs index 1e35767d..a304615c 100644 --- a/app/app/templates/components/section/github/type-editor.hbs +++ b/app/app/templates/components/section/github/type-editor.hbs @@ -20,16 +20,16 @@ {{input id="branch-since" value=config.branchSince type="text" }}
- - {{input id="show-milestone" checked=config.showMilestones type="checkbox"}}
-
-
- - {{input id="show-issues" checked=config.showIssues type="checkbox"}}
-
-
- - {{input id="show-commits" checked=config.showCommits type="checkbox" }}
+ +
Select the views you want to show
+
+ {{input id="show-milestone" checked=config.showMilestones type="checkbox"}} + + {{input id="show-issues" checked=config.showIssues type="checkbox"}} + + {{input id="show-commits" checked=config.showCommits type="checkbox" }} + +
diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go index 09caf910..c1ba6211 100644 --- a/core/section/github/commits_template.go +++ b/core/section/github/commits_template.go @@ -71,7 +71,7 @@ const commitsTemplate = ` - @@ -79,11 +79,11 @@ const commitsTemplate = ` {{range $commit := .BranchCommits}} - - - @@ -50,10 +49,10 @@ const ( {{else}} ` + closedIsvg + ` {{end}} - {{$data.Message}}#{{$data.ID}} + {{$data.Message}}#{{$data.ID}} {{$data.Labels}} -
Commits {{len .BranchCommits}} commits by {{.NumContributors}} contributors + Commits · {{len .BranchCommits}} commits by {{.NumContributors}} contributors
+ {{$commit.Message}} - {{$commit.Branch}} + {{$commit.Branch}} +
@{{$commit.Name}} {{$commit.Name}} diff --git a/core/section/github/issues_template.go b/core/section/github/issues_template.go index a7571e8a..a33a757c 100644 --- a/core/section/github/issues_template.go +++ b/core/section/github/issues_template.go @@ -33,10 +33,9 @@ const (
- Issues {{.ClosedIssues}} closed {{if eq 1 .ClosedIssues}}{{else}}issues{{end}} and {{.OpenIssues}} open + Issues · {{.ClosedIssues}} closed {{if eq 1 .ClosedIssues}}{{else}}issues{{end}} and {{.OpenIssues}} open {{if eq 1 .OpenIssues}}issue{{else}}{{end}}
+
{{$data.Milestone}} · {{$data.Creator}} · {{$data.Date}} diff --git a/core/section/github/milestones.go b/core/section/github/milestones.go index fedc1abe..6a4ae384 100644 --- a/core/section/github/milestones.go +++ b/core/section/github/milestones.go @@ -119,7 +119,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 " + (*v.DueOn).Format(milestonesTimeFormat) + "" } up := "" if v.UpdatedAt != nil { @@ -210,10 +210,10 @@ func renderMilestones(payload *githubRender, c *githubConfig) error { } } if issuesClosed+issuesOpen > 0 { - payload.Milestones = append(payload.Milestones, githubMilestone{ - Repo: orb.Repo, Private: orb.Private, Name: noMilestone, IsOpen: true, - OpenIssues: issuesOpen, ClosedIssues: issuesClosed, URL: template.URL(orb.URL), - }) + //payload.Milestones = append(payload.Milestones, githubMilestone{ + // Repo: orb.Repo, Private: orb.Private, Name: noMilestone, IsOpen: true, + // OpenIssues: issuesOpen, ClosedIssues: issuesClosed, URL: template.URL(orb.URL), + //}) } hadRepo[rName] = true diff --git a/core/section/github/milestones_template.go b/core/section/github/milestones_template.go index a98316e3..9b194e50 100644 --- a/core/section/github/milestones_template.go +++ b/core/section/github/milestones_template.go @@ -14,15 +14,15 @@ package github const ( rawMSsvg = `` openMSsvg = ` - + ` + rawMSsvg + ` ` closedMSsvg = ` - - + @@ -33,7 +33,7 @@ const ( - @@ -50,21 +50,20 @@ const ( ` + closedMSsvg + ` {{end}} {{end}} + {{$data.Name}} + · {{if $data.IsMilestone}} {{$data.DueDate}}{{end}} - - {{end}} diff --git a/core/section/trello/trad_template.go b/core/section/trello/trad_template.go index 72cff5bf..ada42788 100644 --- a/core/section/trello/trad_template.go +++ b/core/section/trello/trad_template.go @@ -15,8 +15,7 @@ const tradTemplate = `
{{if ne .Detail.Board.ID ""}}
-

{{.Detail.Board.Name}} Board

-

There are {{ .Detail.CardCount }} cards across {{ .Detail.ListCount }} lists

+

There are {{ .Detail.CardCount }} cards across {{ .Detail.ListCount }} lists on {{.Detail.Board.Name}} Board

Non-printable

@@ -26,7 +25,7 @@ const tradTemplate = ` {{range $data := .Detail.Data}}
- +
Milestones {{.ClosedMS}} closed and {{.OpenMS}} open + Milestones · {{.ClosedMS}} closed and {{.OpenMS}} open
-
{{$data.Name}}
- {{$data.Repo}} + 		{{if $data.IsMilestone}} - · {{$data.DueDate}} - {{end}} - - {{if $data.IsMilestone}} - -
{{$data.CompleteMsg}} complete    {{$data.OpenIssues}} open    {{$data.ClosedIssues}} closed
+ {{$data.CompleteMsg}} complete + {{$data.OpenIssues}} open + {{$data.ClosedIssues}} closed {{else}} -
{{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
+ {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed {{end}} +
+
+
{{ $data.List.Name }} {{len $data.Cards}} cards{{ $data.List.Name }} · {{len $data.Cards}} cards