Merge branch 'master' into github-extension

app/app/pods/search/template.hbs

@@ -2,17 +2,21 @@
 
 	{{layout/zone-navigation}}
 
-	{{#layout/zone-header title=session.appMeta.title message=session.appMeta.message}}
-		{{layout/button-home}}
-	{{/layout/zone-header}}
-
 	<div class="page-search">
-		<div class="input-control">
+
-			<label>Search</label>
+		<div id="zone-header" class="zone-header">
-			<div class="tip">#tags, keywords, "some phrase", keyword AND keyword, keyword OR keyword</div>
+			<div class="input-control pull-left width-60">
-			{{focus-input class="input" type="text" value=filter placeholder='start typing...'}}
+				<label>Search</label>
+				{{focus-input class="input" type="text" value=filter placeholder='#tags, keywords, "some phrase", keyword AND keyword, keyword OR keyword'}}
+			</div>
+			<div class="actions pull-right hidden-xs hidden-sm">
+				{{layout/button-home}}
+			</div>
+			<div class="clearfix"></div>
 		</div>
+
 		{{search/search-results results=results}}
+
 	</div>
 
 {{/layout/zone-container}}

app/app/styles/view/page-search.scss

@@ -1,8 +1,26 @@
 .page-search {
-	margin: 50px 100px;
+
+	> .zone-header {
+		background-color: $color-header;
+		padding: 0 40px 0 40px;
+	}
+
+	.input-control {
+		padding: 20px 0;
+		margin-bottom: 0;
+	}
+
+	.input-control input {
+		background-color: $color-header;
+	}
+
+	.input-control input:focus {
+
+	}
 
 	.search-results {
 		margin: 50px 0;
+		padding: 0 40px 0 40px;
 
 	    .heading {
 	        font-size: 1.2rem;
@@ -16,6 +34,8 @@
 	        > .item {
 	            cursor: pointer;
 				margin: 0 30px 30px 0;
+				padding-bottom: 40px;
+    			border-bottom: 1px solid #e1e1e1;
 
                 > .link {
                     text-decoration: none;
@@ -40,18 +60,15 @@
                     > .excerpt {
 						margin-top: 1rem;
                         font-size: 0.9rem;
-						margin-left: 20px;
                     }
 
 					> .chips {
 						margin-top: 1rem;
-						margin-left: 20px;
 					}
                 }
 
 				> .references {
 					margin-top: 1rem;
-					margin-left: 20px;
 
 					> .label {
 						font-size: 0.9rem;

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

@@ -6,13 +6,13 @@
                     <i class="material-icons">apps</i>
                 </div>
             {{else}}
-                {{#link-to 'application' title=session.appMeta.title}}
+                {{#link-to 'application'}}
-                    <div class="header-button">
+                    <div class="header-button" title=session.appMeta.title>
                         <i class="material-icons">apps</i>
                     </div>
                 {{/link-to}}
             {{/if}}
-			{{#link-to 'application' class="title"}}
+			{{#link-to 'application'}}
             	<div>{{session.appMeta.title}}</div>
 			{{/link-to}}
     	</div>