Merge branch 'master' into github-extension

app/app/components/section/github/type-editor.js

@@ -276,15 +276,15 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
 		let states = [];
 		states[0] = {
 			id: "open",
-			name: "Show Open Issues"
+			name: "Open Issues"
 		};
 		states[1] = {
 			id: "closed",
-			name: "Show Closed Issues"
+			name: "Closed Issues"
 		};
 		states[2] = {
 			id: "all",
-			name: "Show All Issues"
+			name: "All Issues"
 		};
 
 		this.set("states", states);

app/app/styles/view/layout.scss

@@ -97,7 +97,7 @@
 		> .message {
 			color: $color-gray;
 			font-size: 1rem;
-			margin-top: 10px;
+			margin: 10px 0 0 5px;
 		}
 	}
 	> .actions {

app/app/templates/components/layout/zone-header.hbs

@@ -1,7 +1,7 @@
 <div id="zone-header" class="zone-header">
 	<div class="info pull-left width-60">
 		<div class="title">
-			{{title}}
+			&nbsp;{{title}}
 		</div>
 		<div class="{{if hasMessage "message"}}">
 			{{message}}

documize/section/github/model.go

@@ -72,19 +72,19 @@ var renderTemplates = map[string]string{
 <div class="section-github-render">
 	<p>
 		{{if .ShowIssueNumbers}}
-			Show Selected Issues
+			Showing Selected Issues
 		{{else}}
 			{{ .Config.IssueState.Name }}
 		{{end}}
 		    for repository <a href="{{ .Repo.URL }}/issues">{{.Repo.Name}}</a>
 		{{if .ShowList}}
-			with label(s)
+			labelled
 			{{range $label := .List}}
 				{{if $label.Included}}
 					<span class="github-issue-label" style="background-color:#{{$label.Color}}">{{$label.Name}}</span>
 				{{end}}
 			{{end}}
-		{{end}};
+		{{end}}
 		{{if .ShowIssueNumbers}}
 			issue(s) {{ .DateMessage }}.
 		{{else}}