From 941d0d0057c928ed3c53b8ed283d1d1b6fb37e18 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 17 Dec 2015 10:49:39 -0800
Subject: [PATCH] [Frontend] Tree sanding and polishing

open #431
Fixed vertical margins problem in tree and search results;
---
 .../commonUI/general/res/sass/search/_search.scss     |  3 +--
 .../themes/espresso/res/css/theme-espresso.css        | 11 +++++------
 platform/commonUI/themes/snow/res/css/theme-snow.css  | 11 +++++------
 platform/search/res/templates/search.html             | 10 ++++++----
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index adc5342e8b..37043ae939 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -128,7 +128,7 @@
 	}
 
 	.active-filter-display {
-		$s: 0.65em;
+		$s: 0.7em;
 		$p: $interiorMargin;
 		@include box-sizing(border-box);
 		line-height: 130%;
@@ -147,7 +147,6 @@
 
 	.search-results {
         @include trans-prop-nice((opacity, visibility), 250ms);
-        margin-top: $interiorMarginLg; // Always include margin here to fend off the search input
 		padding-right: $interiorMargin;
         .hint {
             margin-bottom: $interiorMarginLg;
diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
index a71ff5f53d..77c47f163d 100644
--- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css
+++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
@@ -5246,8 +5246,8 @@ span.req {
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   line-height: 130%;
-  padding-left: 1.4625em;
-  font-size: 0.65em; }
+  padding-left: 1.575em;
+  font-size: 0.7em; }
   /* line 138, ../../../../general/res/sass/search/_search.scss */
   .holder-search .active-filter-display .clear-filters-icon {
     color: #737373;
@@ -5274,18 +5274,17 @@ span.req {
   -o-transition-delay: 0;
   -webkit-transition-delay: 0;
   transition-delay: 0;
-  margin-top: 10px;
   padding-right: 5px; }
-  /* line 152, ../../../../general/res/sass/search/_search.scss */
+  /* line 151, ../../../../general/res/sass/search/_search.scss */
   .holder-search .search-results .hint {
     margin-bottom: 10px;
     font-size: 0.65em;
     opacity: 0.6; }
-  /* line 157, ../../../../general/res/sass/search/_search.scss */
+  /* line 156, ../../../../general/res/sass/search/_search.scss */
   .holder-search .search-results.active {
     visibility: visible;
     opacity: 1; }
-  /* line 161, ../../../../general/res/sass/search/_search.scss */
+  /* line 160, ../../../../general/res/sass/search/_search.scss */
   .holder-search .search-results .load-more-button {
     -moz-transform: translateX(-50%);
     -ms-transform: translateX(-50%);
diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css
index bca5ac2a5b..1fb406ca1d 100644
--- a/platform/commonUI/themes/snow/res/css/theme-snow.css
+++ b/platform/commonUI/themes/snow/res/css/theme-snow.css
@@ -5168,8 +5168,8 @@ span.req {
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   line-height: 130%;
-  padding-left: 1.4625em;
-  font-size: 0.65em; }
+  padding-left: 1.575em;
+  font-size: 0.7em; }
   /* line 138, ../../../../general/res/sass/search/_search.scss */
   .holder-search .active-filter-display .clear-filters-icon {
     color: #a6a6a6;
@@ -5196,18 +5196,17 @@ span.req {
   -o-transition-delay: 0;
   -webkit-transition-delay: 0;
   transition-delay: 0;
-  margin-top: 10px;
   padding-right: 5px; }
-  /* line 152, ../../../../general/res/sass/search/_search.scss */
+  /* line 151, ../../../../general/res/sass/search/_search.scss */
   .holder-search .search-results .hint {
     margin-bottom: 10px;
     font-size: 0.65em;
     opacity: 0.6; }
-  /* line 157, ../../../../general/res/sass/search/_search.scss */
+  /* line 156, ../../../../general/res/sass/search/_search.scss */
   .holder-search .search-results.active {
     visibility: visible;
     opacity: 1; }
-  /* line 161, ../../../../general/res/sass/search/_search.scss */
+  /* line 160, ../../../../general/res/sass/search/_search.scss */
   .holder-search .search-results .load-more-button {
     -moz-transform: translateX(-50%);
     -ms-transform: translateX(-50%);
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html
index c17695d74d..e3f72e78b5 100644
--- a/platform/search/res/templates/search.html
+++ b/platform/search/res/templates/search.html
@@ -20,11 +20,13 @@
  at runtime from the About dialog for additional information.
 -->
 <div class="l-flex-col flex-elem grows holder holder-search"  ng-controller="SearchController as controller">
-    <div class="search-bar flex-elem" ng-controller="ClickAwayController as toggle">
+    <div class="search-bar flex-elem"
+         ng-controller="ClickAwayController as toggle"
+         ng-class="{ holder: !(ngModel.input === '' || ngModel.input === undefined) }">
         <input class="search-input"
                type="text"
                ng-model="ngModel.input"
-               ng-keyup="controller.search()" />
+               ng-keyup="controller.search()"/>
         <a class="clear-icon"
            ng-class="{show: !(ngModel.input === '' || ngModel.input === undefined)}"
            ng-click="ngModel.input = ''; controller.search()"></a>
@@ -37,13 +39,13 @@
                      ng-click="toggle.setState(true)">
         </mct-include>
     </div>
-    <div class="active-filter-display flex-elem"
+    <div class="active-filter-display flex-elem holder"
          ng-class="{off: ngModel.filtersString === '' || ngModel.filtersString === undefined || !ngModel.search}"
          ng-controller="SearchMenuController as menuController">
         <a class="clear-icon clear-filters-icon"
            ng-click="ngModel.checkAll = true; menuController.checkAll()"></a>Filtered by: {{ ngModel.filtersString }}
     </div>
-    <div class="search-results flex-elem grows vscroll"
+    <div class="search-results flex-elem holder grows vscroll"
          ng-class="{ off: !(loading || results.length > 0), loading: loading }">
         <mct-representation key="'search-item'"
                             ng-repeat="result in results"