From 52a9fcf5d6ca8bcdb4df6df1125a2f3208bc7ced Mon Sep 17 00:00:00 2001 From: shale Date: Thu, 23 Jul 2015 13:29:11 -0700 Subject: [PATCH] [Search] Changed highlight size The search item highlight when selected or hovered over is now talled, and the margin between search items is reduced to counteract any effect to spacing. --- platform/commonUI/general/res/css/tree.css | 24 +++++++++---------- .../general/res/sass/search/_search.scss | 10 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 0df48caeb2..c49bb1892b 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -308,14 +308,14 @@ ul.tree { -o-transition: background-color 0.25s; -webkit-transition: background-color 0.25s; transition: background-color 0.25s; - margin-bottom: 5px; + margin-bottom: 2px; border-radius: 2px; - padding-top: 2px; - padding-bottom: 1px; } - /* line 82, ../sass/search/_search.scss */ + padding-top: 4px; + padding-bottom: 2px; } + /* line 84, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item .label { margin-left: 6px; } - /* line 86, ../sass/search/_search.scss */ + /* line 88, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item .label .title-label { display: inline-block; position: absolute; @@ -327,27 +327,27 @@ ul.tree { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 108, ../sass/search/_search.scss */ + /* line 110, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item.selected { background: #005177; color: #fff; } - /* line 112, ../sass/search/_search.scss */ + /* line 114, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item.selected .view-control { color: #0099cc; } - /* line 115, ../sass/search/_search.scss */ + /* line 117, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item.selected .label .type-icon { color: #fff; } - /* line 122, ../sass/search/_search.scss */ + /* line 124, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item:not(.selected):hover { background: #404040; color: #cccccc; } - /* line 125, ../sass/search/_search.scss */ + /* line 127, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item:not(.selected):hover .context-trigger { display: block; } - /* line 128, ../sass/search/_search.scss */ + /* line 130, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item:not(.selected):hover .icon { color: #33ccff; } - /* line 136, ../sass/search/_search.scss */ + /* line 138, ../sass/search/_search.scss */ .search-holder .search .load-more-button { margin-top: 5px; position: relative; diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index 026fe9bc26..59361e4a72 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -72,12 +72,14 @@ @include single-transition(background-color, 0.25s); // Space the results from each other - margin-bottom: 5px; + margin-bottom: 2px; - // Make the highlights the right color and shape + // Make the highlights the right color and shape. + // Attempting to match the style in the tree, but we + // while having these be compact. border-radius: 2px; - padding-top: 2px; - padding-bottom: 1px; + padding-top: 4px; + padding-bottom: 2px; .label { // Give some padding away from the left side