[Search, Mobile] Merge

Merged search/master into mobile. Adjusted the search bar to work on branch and fit accordingly.
2015-08-25 15:27:21 -07:00
parent 0fa330adff 509badb225
commit e8bc9ecc1a
37 changed files with 2141 additions and 291 deletions
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -229,10 +229,12 @@
 			    bottom: $interiorMargin;
 		    }
 	    }
+	    .search-holder {
+		    top: $ueTopBarH + $interiorMarginLg;
+	    }
 	    .tree-holder {
 		    overflow: auto;
-		    top: $ueTopBarH + $interiorMarginLg;
-            padding-right: $interiorMargin;
+			top: $ueTopBarH + $interiorMarginLg + $treeSearchInputBarH + $interiorMargin;
 	    }
    }
    &.items {