Merge branch 'develop'

SylTi · Nov 24, 2014 · ef04462 · ef04462
2 parents 46b03bd + 3a77d28
commit ef04462
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/client/app/app.css b/client/app/app.css
@@ -60,8 +60,8 @@ a.navbar-brand img {
     text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 .hero-unit .container h1 {
-    color:white;
-    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+  color:white;
+  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
 .hero-unit .container .fa-4x {
@@ -134,3 +134,49 @@ div#navbar-main button {
 div#searchbar {
     margin-top: 5px;
 }
+
+/* AJAX Loader Bar */
+#loading-bar .bar {
+  background: rgba(255, 133, 27, 1);
+}
+
+#loading-bar .peg {
+  -moz-box-shadow: rgba(255, 133, 27, .8) 1px 0 6px 1px;
+  -ms-box-shadow: rgba(255, 133, 27, .8) 1px 0 6px 1px;
+  -webkit-box-shadow: rgba(255, 133, 27, .8) 1px 0 6px 1px;
+  box-shadow: rgba(255, 133, 27, .8) 1px 0 6px 1px;
+}
+
+/* Autocomplete search bar */
+div#searchbar .angucomplete-dropdown {
+    border-color: #ececec;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px;
+    width: 500px;
+    padding: 6px 6px 3px 6px;
+    cursor: pointer;
+    z-index: 9999;
+    position: absolute;
+    /*top: 32px;
+    left: 0px;
+    */
+    margin-top: -6px;
+    background-color: #ffffff;
+}
+
+div#searchbar .angucomplete-selected-row, .angucomplete-row {
+padding:10px;
+}
+
+div#searchbar .angucomplete-selected-row, .angucomplete-row:hover {
+    background-color: #EFEFEF;
+    color: #222;
+}
+
+div#searchbar .angucomplete-description {
+  font-size: 12px;
+  color:#CCC;
+}
+
+
diff --git a/client/app/main/main.css b/client/app/main/main.css
@@ -8,7 +8,7 @@
 }
 
 #banner h1 {
-    font-size: 60px;
+    font-size: 50px;
     line-height: 1;
     letter-spacing: -1px;
 }

diff --git a/client/components/navbar/navbar.jade b/client/components/navbar/navbar.jade
@@ -29,7 +29,7 @@ div.navbar.navbar-default.navbar-static-top(ng-controller='NavbarCtrl')
                           remote-url="/api/projects/search/",
                           remote-url-data-field="data",
                           title-field="name",
-                          description-field="description",
+                          description-field="",
                           minlength=2,
                           override-suggestions="true",
                           inputclass="form-control")