From 4759162bb7041fbe2a3963f7f376086fa3d4decd Mon Sep 17 00:00:00 2001 From: shale Date: Thu, 23 Jul 2015 11:08:31 -0700 Subject: [PATCH] [Search] Added right padding Added padding to the right side of the search holder to match the tree holder's padding. --- platform/commonUI/general/res/css/tree.css | 23 ++++++++++--------- .../general/res/sass/search/_search.scss | 10 +++++--- .../src/controllers/SearchItemController.js | 3 +-- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 370737cd15..6a75b9617e 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -273,46 +273,47 @@ ul.tree { *****************************************************************************/ /* line 22, ../sass/search/_search.scss */ .search-holder { - overflow-y: auto; } - /* line 30, ../sass/search/_search.scss */ + overflow-y: auto; + padding-right: 5px; } + /* line 33, ../sass/search/_search.scss */ .search-holder .search .search-input { margin-top: 10px; width: 100%; } - /* line 36, ../sass/search/_search.scss */ + /* line 39, ../sass/search/_search.scss */ .search-holder .search .results { margin-top: 10px; } - /* line 40, ../sass/search/_search.scss */ + /* line 43, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item { margin-bottom: 5px; border-radius: 2px; padding-top: 2px; padding-bottom: 1px; } - /* line 49, ../sass/search/_search.scss */ + /* line 52, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item .label { margin-left: 6px; } - /* line 53, ../sass/search/_search.scss */ + /* line 56, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item .label .title-label { display: inline-block; position: absolute; left: 29px; - right: 0; + right: 5px; font-size: .8em; line-height: 17px; width: auto; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - /* line 74, ../sass/search/_search.scss */ + /* line 78, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item.selected { background: #005177; color: #fff; } - /* line 78, ../sass/search/_search.scss */ + /* line 82, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item.selected .view-control { color: #0099cc; } - /* line 81, ../sass/search/_search.scss */ + /* line 85, ../sass/search/_search.scss */ .search-holder .search .results .search-result-item.selected .label .type-icon { color: #fff; } - /* line 88, ../sass/search/_search.scss */ + /* line 92, ../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 d6a7ba0789..307824ca37 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -20,12 +20,15 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .search-holder { + $iconWidth: 20px; + $leftMargin: 6px; + $rightPadding: 5px; + //position: relative; overflow-y: auto; // This should make it scroll, but isn't wokring :( + padding-right: $rightPadding; .search { - $iconWidth: 20px; - $leftMargin: 6px; .search-input { // Align with the top of the divider bar, below create button @@ -56,7 +59,8 @@ // Give some padding away from the left side left: $leftMargin + 3px + $iconWidth; - right: 0; + // and the right side + right: $rightPadding; // Size and position the text font-size: .8em; diff --git a/platform/features/search/src/controllers/SearchItemController.js b/platform/features/search/src/controllers/SearchItemController.js index bcf9530bd1..f7c022850f 100644 --- a/platform/features/search/src/controllers/SearchItemController.js +++ b/platform/features/search/src/controllers/SearchItemController.js @@ -22,8 +22,7 @@ /*global define*/ /** - * Module defining SearchItemController. Based on TreeNodeController. - * Created by shale on 07/22/2015. + * Module defining SearchItemController. Created by shale on 07/22/2015. */ define(function () { "use strict";