Merge master

Author: orta

assets/script/search.ts

@@ -31,10 +31,12 @@ function typeSearch(el: HTMLInputElement) {
 		displayKey: 't',
 		templates: {
 			suggestion: (obj: MinifiedSearchRecord) => {
-				return `<div class="suggestion">
+				return `
+					<div class="suggestion">
 						<span class="type-package-name">${obj.t}</span>
 						<span class="library-name">${obj.l}</span>
-						</div>`
+					</div>
+				`;
 			}
 		}
 	};
@@ -57,7 +59,7 @@ function typeSearch(el: HTMLInputElement) {
 		return new Bloodhound<MinifiedSearchRecord>({
 			// See https://github.com/twitter/typeahead.js/blob/master/doc/bloodhound.md#options
 			prefetch: searchIndexUrl,
-			datumTokenizer: entry => {
+			datumTokenizer: (entry: MinifiedSearchRecord) => {
 				return [entry.l, entry.p, entry.t].concat(entry.g).concat(entry.m);
 			},
 			queryTokenizer: input => {
@@ -71,12 +73,12 @@ function typeSearch(el: HTMLInputElement) {
 				if (x.t === query || x.t === (query + "js") || x.t === (query + ".js") || x.t === (query + "-js")) {
 					return -1;
 				}
-				else if (y.t === query || y.t === (query + "js") || y.t === (query + ".js") || y.t === (query + "-js")) {
+
+				if (y.t === query || y.t === (query + "js") || y.t === (query + ".js") || y.t === (query + "-js")) {
 					return 1;
 				}
-				else {
-					return y.d - x.d;
-				}
+				
+				return y.d - x.d;
 			}
 		});
 	}

assets/static/demo.css

@@ -4,16 +4,15 @@
     <meta charset="utf-8">
     <title>TypeScript Types Search</title>
     <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico">
-    <link rel="stylesheet" href="demo.css">
     <link rel="stylesheet" href="style.css">
     <script src="lib/jquery.min.js"></script>
     <script src="lib/typeahead.bundle.min.js"></script>
     <script src="script/search.js"></script>
     <script>
     	$(function() {
-            var el = document.getElementById('demo');
-    		typeSearch(el);
-            $(el).focus();
+        var el = document.getElementById('demo');
+        typeSearch(el);
+        $(el).focus();
     	});
     </script>
   </head>
@@ -24,8 +23,17 @@ <h1><span class="typescript"><span class="bold">Type</span>Search</span></h1>
     	<div id="output"></div>
     </div>
 
-    <div class="footer">Powered by <a href="https://github.com/DefinitelyTyped/DefinitelyTyped">DefinitelyTyped</a> and <a href="https://github.com/Microsoft/types-publisher">types-publisher</a></div>
+    <div class="footer">
+      Powered by <a href="https://github.com/DefinitelyTyped/DefinitelyTyped">DefinitelyTyped</a> and <a href="https://github.com/Microsoft/types-publisher">types-publisher</a>
+    </div>
 
-<a href="https://github.com/Microsoft/TypeSearch"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
+    <a href="https://github.com/Microsoft/TypeSearch">
+      <img
+        style="position: absolute; top: 0; right: 0; border: 0;"
+        src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" 
+        alt="Fork me on GitHub"
+        data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"
+      />
+    </a>
   </body>
 </html>

assets/static/index.html

@@ -1,26 +1,38 @@
 body {
-    font-family: wf_segoe-ui_normal,Verdana,Geneva,Tahoma,sans-serif;;
+    margin: 0;
+    text-align: center;
+    font-family: wf_segoe-ui_normal, Verdana, Geneva, Tahoma, sans-serif;
+    font-size: 24px;
+    line-height: 1.4;
+    position: relative;
+    padding-top: 1em;
 }
 
-h1 {
+h1.headline {
     font-weight: 100;
+    margin-bottom: 1.4em;
+    color: #294E80;
 }
 
 span.bold {
-    font-weight: 500;
+    font-weight: 700;
+}
+
+#demo {
+    width: 20em;
 }
 
 div.suggestion {
     border: solid 1px gray;
+    border-radius: 8px;
     cursor: pointer;
+    background-color: #FFFFFF;
 }
 
-.twitter-typehead {
-    position: relative;
+.tt-hint, .tt-input, .tt-menu { 
+    width: 100%; 
 }
 
-.tt-hint, .tt-input, .tt-menu { width: 100%; }
-
 span.type-package-name {
     font-family: monospace;
     text-align: left;
@@ -47,9 +59,10 @@ span.library-name {
 .tt-dropdown-menu, .gist {
     text-align: left;
 }
+
 .typeahead, .tt-query, .tt-hint {
     border: 2px solid #CCCCCC;
-    border-radius: 8px 8px 8px 8px;
+    border-radius: 8px;
     font-size: 24px;
     height: 30px;
     line-height: 30px;
@@ -61,7 +74,7 @@ span.library-name {
     background-color: #FFFFFF;
 }
 .typeahead:focus {
-    border: 2px solid #0097CF;
+    border: 2px solid #294E80;
 }
 .tt-query {
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
@@ -84,9 +97,22 @@ span.library-name {
     height: 24px;
 }
 .tt-suggestion.tt-cursor {
-    background-color: #0097CF;
+    background-color: #294E80;
     color: #FFFFFF;
 }
 .tt-suggestion p {
     margin: 0;
 }
+
+.footer {
+    font-size: 80%;
+    position: fixed;
+    bottom: 12px;
+    left: 0px;
+    right: 0px;
+    text-align: center;
+}
+
+.footer a, .footer a:visited {
+    color: #294E80;
+}