ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-31 16:36:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Search] Fixed scrolling and layout edit

Browse Source 
Changed the CSS so that scrolling for the tree and
search results works again. Additionally, layout
editing works again.
This commit is contained in:
slhale 2015-07-28 12:33:22 -07:00
parent 1a9dd2f144
commit 32b58715c6
4 changed files with 27 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -700,13 +700,9 @@ mct-container {
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* line 29, ../sass/search/_layout.scss */
.split-layout.vertical > .pane:first-child .holder {
position: relative; }
/* line 44, ../sass/search/_layout.scss */
/* line 26, ../sass/search/_layout.scss */
.pane.treeview.left .tree-holder {
top: 0; }
top: 60px; }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government

40
platform/commonUI/general/res/css/tree.css
View File

@ -273,19 +273,21 @@ ul.tree {
*****************************************************************************/
/* line 23, ../sass/search/_search.scss */
.search-holder {
padding-right: 5px; }
/* line 36, ../sass/search/_search.scss */
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 42, ../sass/search/_search.scss */
/* line 43, ../sass/search/_search.scss */
.search-holder .search .search-scroll {
height: 100%;
overflow: auto; }
/* line 46, ../sass/search/_search.scss */
/* line 47, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results {
margin-top: 10px; }
/* line 50, ../sass/search/_search.scss */
/* line 51, ../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;
@ -295,10 +297,10 @@ ul.tree {
border-radius: 2px;
padding-top: 4px;
padding-bottom: 2px; }
/* line 64, ../sass/search/_search.scss */
/* line 65, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label {
margin-left: 6px; }
/* line 68, ../sass/search/_search.scss */
/* line 69, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label .title-label {
display: inline-block;
position: absolute;
@ -310,47 +312,47 @@ ul.tree {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 90, ../sass/search/_search.scss */
/* line 91, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected {
background: #005177;
color: #fff; }
/* line 94, ../sass/search/_search.scss */
/* line 95, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .view-control {
color: #0099cc; }
/* line 97, ../sass/search/_search.scss */
/* line 98, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
color: #fff; }
/* line 104, ../sass/search/_search.scss */
/* line 105, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
background: #404040;
color: #cccccc; }
/* line 107, ../sass/search/_search.scss */
/* line 108, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
display: block; }
/* line 110, ../sass/search/_search.scss */
/* line 111, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
color: #33ccff; }
/* line 118, ../sass/search/_search.scss */
/* line 119, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon {
position: relative; }
/* line 120, ../sass/search/_search.scss */
/* line 121, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading {
pointer-events: none;
margin-left: 6px; }
/* line 124, ../sass/search/_search.scss */
/* line 125, ../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 134, ../sass/search/_search.scss */
/* line 135, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading .wait-spinner {
margin-left: 6px; }
/* line 139, ../sass/search/_search.scss */
/* line 140, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon:not(.loading) {
cursor: pointer; }
/* line 144, ../sass/search/_search.scss */
/* line 145, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-more-button {
margin-top: 5px;
margin-bottom: 5px;

32
platform/commonUI/general/res/sass/search/_layout.scss
View File

@ -21,39 +21,11 @@
*****************************************************************************/
// Overrides some styling in user-environ/_layout.scss
.split-layout {
&.vertical {
>.pane {
&:first-child {
.holder {
// Want tree holder to dissapear when search is activated.
// Currently though, just have the tree holder position
// relative to search.
position: relative;
}
}
}
}
}
.pane {
&.treeview.left {
//overflow: auto; // This one works! (But the bar goes too high)
.tree-holder {
// Want tree holder to start right below the search bar
top: 0;
// Make tree invisible when there are things in search results
&.search-in-use {
//display: none;
}
// Want tree holder to start right below the search bar.
top: 60px;
}
.search-holder {
//overflow: auto;
}
}
}

3
platform/commonUI/general/res/sass/search/_search.scss
View File

@ -26,8 +26,9 @@
$rightPadding: 5px;
//position: relative;
//overflow-y: auto; // This should make it scroll, but isn't wokring :(
overflow-y: auto;
padding-right: $rightPadding;
top: 23px;
.search {
//height: auto;