From 3ae681c79c5ffeb6b63073d08c34e05b252f078e Mon Sep 17 00:00:00 2001
From: shale <sarah.hale@nasa.gov>
Date: Wed, 22 Jul 2015 12:33:16 -0700
Subject: [PATCH] [Search] Colors and positioning

Corrected the colors back to the normal
style. Also made the text on the same
line as the icon, but this fix is a
temporary one.
---
 platform/commonUI/general/res/css/tree.css    | 36 +++++++++----------
 .../general/res/sass/search/_search.scss      | 36 ++++++++++++-------
 .../search/res/templates/searchbar.html       |  9 ++---
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css
index 21d4de5e92..a1372825a9 100644
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -271,22 +271,20 @@ ul.tree {
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/* line 23, ../sass/search/_search.scss */
-span.searchbar {
-  color: #ff0099; }
-  /* line 26, ../sass/search/_search.scss */
-  span.searchbar .results {
-    color: #ff0000; }
-    /* line 31, ../sass/search/_search.scss */
-    span.searchbar .results .searchbar-item {
-      color: #8800ff; }
-      /* line 35, ../sass/search/_search.scss */
-      span.searchbar .results .searchbar-item .label {
-        color: #00aa00; }
-        /* line 38, ../sass/search/_search.scss */
-        span.searchbar .results .searchbar-item .label .title-label {
-          color: #aa00aa;
-          display: block;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap; }
+/* line 27, ../sass/search/_search.scss */
+span.search-holder .searchbar {
+  width: 100%;
+  margin-top: 20px; }
+/* line 44, ../sass/search/_search.scss */
+span.search-holder .results .searchbar-item .label .title-label {
+  position: relative;
+  left: 20px;
+  top: -17px;
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap; }
+/* line 58, ../sass/search/_search.scss */
+span.search-holder .load-more-button {
+  width: 100%;
+  margin-top: 20px; }
diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index 917317aaa7..a6d0b64672 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -20,28 +20,33 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-span.searchbar {
-    color: #ff0099;
-	//@include menuUlReset();
+span.search-holder {
+    $iconwidth: 20px;
+    $iconheight: 17px;
+    
+    .searchbar {
+        width: 100%;
+        margin-top: 20px;
+    }
+    
 	.results {
-		//display: block;
-		//position: relative;
-        color: #ff0000;
         
 		.searchbar-item {
-			$runningItemW: 0;
-            color: #8800ff;
+            //margin-top: 5px;
             
             .label {
-                color: #00aa00;
+                
+				.type-icon {
+					.icon {
+					}
+				}
                 
                 .title-label {
-                    color: #aa00aa;
+                    position: relative;
+                    left: $iconwidth;
+                    top: -$iconheight;
                     
-					//@include absPosDefault();
 					display: block;
-					//left: $runningItemW + ($interiorMargin * 3);
-                    //left: 60px;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: nowrap;
@@ -49,4 +54,9 @@ span.searchbar {
             }
 		}
 	}
+    
+    .load-more-button {
+        width: 100%;
+        margin-top: 20px;
+    }
 }
\ No newline at end of file
diff --git a/platform/features/search/res/templates/searchbar.html b/platform/features/search/res/templates/searchbar.html
index 0ed0a5f016..76cdaf3cae 100644
--- a/platform/features/search/res/templates/searchbar.html
+++ b/platform/features/search/res/templates/searchbar.html
@@ -19,14 +19,14 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span class="searchbar"
+<span class="search-holder"
       ng-controller="SearchbarController as controller">
     <!-- Search bar input -->
     <div>
-        <input type="text" 
+        <input class="searchbar"
                id="searchbarinput" 
+               type="text" 
                value=""
-               style="width: 100%"
                ng-keyup="controller.search('searchbarinput')" />
     </div>
     
@@ -40,7 +40,8 @@
     
     <!-- Load more? --> 
     <div ng-if="controller.areMore()">
-        <button ng-click="controller.loadMore()"> 
+        <button class="load-more-button"
+                ng-click="controller.loadMore()"> 
             Load more
         </button>
     </div>