[Search] Update CSS

Slight tweak to the padding of the search view, which affects where the top of the scroll bar appears. Also removed the search scroll div because it was unused.
2015-08-03 13:26:29 -07:00
parent e928e02b1c
commit e05f16d780
3 changed files with 203 additions and 219 deletions
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -275,20 +275,16 @@ ul.tree {
 .search-holder {
  overflow-y: auto;
  padding-right: 5px;
-  top: 23px; }
-  /* line 37, ../sass/search/_search.scss */
-  .search-holder .search .search-input {
-    margin-top: 10px;
-    width: 100%; }
-  /* line 43, ../sass/search/_search.scss */
-  .search-holder .search .search-scroll {
-    height: 100%;
-    overflow: auto; }
-    /* line 47, ../sass/search/_search.scss */
-    .search-holder .search .search-scroll .results {
+  top: 23px;
  margin-top: 10px; }
-      /* line 51, ../sass/search/_search.scss */
-      .search-holder .search .search-scroll .results .search-result-item {
+  /* line 38, ../sass/search/_search.scss */
+  .search-holder .search .search-input {
+    width: 100%; }
+  /* line 42, ../sass/search/_search.scss */
+  .search-holder .search .results {
+    margin-top: 10px; }
+    /* line 46, ../sass/search/_search.scss */
+    .search-holder .search .results .search-result-item {
      -moz-transition: background-color 0.25s;
      -o-transition: background-color 0.25s;
      -webkit-transition: background-color 0.25s;
@@ -297,11 +293,11 @@ ul.tree {
      border-radius: 2px;
      padding-top: 4px;
      padding-bottom: 2px; }
-        /* line 65, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .results .search-result-item .label {
+      /* line 60, ../sass/search/_search.scss */
+      .search-holder .search .results .search-result-item .label {
        margin-left: 6px; }
-          /* line 69, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item .label .title-label {
+        /* line 64, ../sass/search/_search.scss */
+        .search-holder .search .results .search-result-item .label .title-label {
          display: inline-block;
          position: absolute;
          left: 29px;
@@ -312,53 +308,54 @@ ul.tree {
          overflow: hidden;
          text-overflow: ellipsis;
          white-space: nowrap; }
-        /* line 91, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .results .search-result-item.selected {
+      /* line 86, ../sass/search/_search.scss */
+      .search-holder .search .results .search-result-item.selected {
        background: #005177;
        color: #fff; }
-          /* line 95, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
+        /* line 90, ../sass/search/_search.scss */
+        .search-holder .search .results .search-result-item.selected .view-control {
          color: #0099cc; }
-          /* line 98, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
+        /* line 93, ../sass/search/_search.scss */
+        .search-holder .search .results .search-result-item.selected .label .type-icon {
          color: #fff; }
-        /* line 105, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
+      /* line 100, ../sass/search/_search.scss */
+      .search-holder .search .results .search-result-item:not(.selected):hover {
        background: #404040;
        color: #cccccc; }
-          /* line 108, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
+        /* line 103, ../sass/search/_search.scss */
+        .search-holder .search .results .search-result-item:not(.selected):hover .context-trigger {
          display: block; }
-          /* line 111, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
+        /* line 106, ../sass/search/_search.scss */
+        .search-holder .search .results .search-result-item:not(.selected):hover .icon {
          color: #33ccff; }
-    /* line 119, ../sass/search/_search.scss */
-    .search-holder .search .search-scroll .load-icon {
+  /* line 114, ../sass/search/_search.scss */
+  .search-holder .search .load-icon {
    position: relative; }
-      /* line 121, ../sass/search/_search.scss */
-      .search-holder .search .search-scroll .load-icon.loading {
+    /* line 116, ../sass/search/_search.scss */
+    .search-holder .search .load-icon.loading {
      pointer-events: none;
      margin-left: 6px; }
-        /* line 125, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .load-icon.loading .title-label {
+      /* line 120, ../sass/search/_search.scss */
+      .search-holder .search .load-icon.loading .title-label {
        font-style: italic;
        font-size: .9em;
        opacity: 0.5;
        margin-left: 26px;
        line-height: 24px; }
-        /* line 135, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .load-icon.loading .wait-spinner {
+      /* line 130, ../sass/search/_search.scss */
+      .search-holder .search .load-icon.loading .wait-spinner {
        margin-left: 6px; }
-      /* line 140, ../sass/search/_search.scss */
-      .search-holder .search .search-scroll .load-icon:not(.loading) {
+    /* line 135, ../sass/search/_search.scss */
+    .search-holder .search .load-icon:not(.loading) {
      cursor: pointer; }
-    /* line 145, ../sass/search/_search.scss */
-    .search-holder .search .search-scroll .load-more-button {
+  /* line 140, ../sass/search/_search.scss */
+  .search-holder .search .load-more-button {
    margin-top: 5px;
    margin-bottom: 5px;
    position: relative;
    left: 25%;
    width: 50%;
+    white-space: nowrap;
    height: 20px;
    line-height: 11px;
    font-size: 0.7em; }
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -30,20 +30,15 @@
    padding-right: $rightPadding;
    top: 23px;
    
-    .search {
-        //height: auto;
-        //overflow: auto;
-        
-        .search-input {
    // Align with the top of the divider bar, below create button
    margin-top: 10px;
+    
+    .search {
+        
+        .search-input {
            width: 100%;
        }
        
-        .search-scroll {
-            height: 100%;
-            overflow: auto;
-            
        .results {
            // Spacing away from the search input
            margin-top: 10px;
@@ -151,15 +146,12 @@
            position: relative;
            left: 25%;
            width: 50%;
+            white-space: nowrap;

            // Make smallish button 
            height: 20px;
            line-height: 11px;
            font-size: 0.7em;
        }
-            
-            // temp
-            //margin-bottom: 30px;
-        }
    }
 }
--- a/platform/search/res/templates/search.html
+++ b/platform/search/res/templates/search.html
@@ -35,9 +35,6 @@
        </mct-control-->
    </div>
    
-    <!-- This div exists to determine scroll bar location -->
-    <div class="search-scroll">
-        
    <!-- Results list -->
    <div class="results">
        <mct-representation key="'search-item'"
@@ -62,6 +59,4 @@
            Load more
        </button>
    </div>
-        
-    </div>
 </div>