From 2ca7a175bdedb31fc465167462fe233e6230e792 Mon Sep 17 00:00:00 2001 From: slhale Date: Thu, 13 Aug 2015 16:40:51 -0700 Subject: [PATCH] [Search] Relative positioning Search results list now displays below the filter options display dynamically. --- platform/commonUI/general/res/css/tree.css | 35 ++++++++++--------- .../general/res/sass/search/_search.scss | 6 ++++ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 4098c5abce..2c7ffb025e 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -419,8 +419,11 @@ ul.tree { .search-holder .search .search-scroll { top: 25px; overflow-y: auto; - padding-right: 5px; } - /* line 252, ../sass/search/_search.scss */ + padding-right: 5px; + top: auto; + bottom: auto; + height: 90%; } + /* line 258, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item { -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; @@ -430,10 +433,10 @@ ul.tree { border-radius: 2px; padding-top: 4px; padding-bottom: 2px; } - /* line 266, ../sass/search/_search.scss */ + /* line 272, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item .label { margin-left: 6px; } - /* line 270, ../sass/search/_search.scss */ + /* line 276, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item .label .title-label { display: inline-block; position: absolute; @@ -445,47 +448,47 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 292, ../sass/search/_search.scss */ + /* line 298, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item.selected { background: #005177; color: #fff; } - /* line 296, ../sass/search/_search.scss */ + /* line 302, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item.selected .view-control { color: #0099cc; } - /* line 299, ../sass/search/_search.scss */ + /* line 305, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon { color: #fff; } - /* line 306, ../sass/search/_search.scss */ + /* line 312, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 309, ../sass/search/_search.scss */ + /* line 315, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger { display: block; } - /* line 312, ../sass/search/_search.scss */ + /* line 318, ../sass/search/_search.scss */ .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon { color: #33ccff; } - /* line 320, ../sass/search/_search.scss */ + /* line 326, ../sass/search/_search.scss */ .search-holder .search .search-scroll .load-icon { position: relative; } - /* line 322, ../sass/search/_search.scss */ + /* line 328, ../sass/search/_search.scss */ .search-holder .search .search-scroll .load-icon.loading { pointer-events: none; margin-left: 6px; } - /* line 326, ../sass/search/_search.scss */ + /* line 332, ../sass/search/_search.scss */ .search-holder .search .search-scroll .load-icon.loading .title-label { font-style: italic; font-size: .9em; opacity: 0.5; margin-left: 26px; line-height: 24px; } - /* line 336, ../sass/search/_search.scss */ + /* line 342, ../sass/search/_search.scss */ .search-holder .search .search-scroll .load-icon.loading .wait-spinner { margin-left: 6px; } - /* line 341, ../sass/search/_search.scss */ + /* line 347, ../sass/search/_search.scss */ .search-holder .search .search-scroll .load-icon:not(.loading) { cursor: pointer; } - /* line 346, ../sass/search/_search.scss */ + /* line 352, ../sass/search/_search.scss */ .search-holder .search .search-scroll .load-more-button { margin-top: 5px; margin-bottom: 5px; diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index d894220fbd..81bb5cfd01 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -247,6 +247,12 @@ overflow-y: auto; padding-right: $rightPadding; + top: auto; + bottom: auto; + height: 90%; + // It overflows the bottom when active-display-filter + // if height is set to 100% + .results { .search-result-item {