alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[Search] Update CSS"

Browse Source 
This reverts commit e05f16d780.
This commit is contained in:
slhale
2015-08-03 13:39:22 -07:00
parent e05f16d780
commit 5569ef8b2d
3 changed files with 218 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,16 +275,20 @@ ul.tree {
.search-holder {
overflow-y: auto;
padding-right: 5px;
top: 23px;
margin-top: 10px; }
/* line 38, ../sass/search/_search.scss */
top: 23px; }
/* line 37, ../sass/search/_search.scss */
.search-holder .search .search-input {
margin-top: 10px;
width: 100%; }
/* line 42, ../sass/search/_search.scss */
.search-holder .search .results {
/* line 43, ../sass/search/_search.scss */
.search-holder .search .search-scroll {
height: 100%;
overflow: auto; }
/* line 47, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results {
margin-top: 10px; }
/* line 46, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item {
/* 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;
-webkit-transition: background-color 0.25s;
@@ -293,11 +297,11 @@ ul.tree {
border-radius: 2px;
padding-top: 4px;
padding-bottom: 2px; }
/* line 60, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item .label {
/* line 65, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label {
margin-left: 6px; }
/* line 64, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item .label .title-label {
/* line 69, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label .title-label {
display: inline-block;
position: absolute;
left: 29px;
@@ -308,54 +312,53 @@ ul.tree {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 86, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item.selected {
/* line 91, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected {
background: #005177;
color: #fff; }
/* line 90, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item.selected .view-control {
/* line 95, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .view-control {
color: #0099cc; }
/* line 93, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item.selected .label .type-icon {
/* line 98, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
color: #fff; }
/* line 100, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item:not(.selected):hover {
/* line 105, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
background: #404040;
color: #cccccc; }
/* line 103, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item:not(.selected):hover .context-trigger {
/* line 108, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
display: block; }
/* line 106, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item:not(.selected):hover .icon {
/* line 111, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
color: #33ccff; }
/* line 114, ../sass/search/_search.scss */
.search-holder .search .load-icon {
/* line 119, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon {
position: relative; }
/* line 116, ../sass/search/_search.scss */
.search-holder .search .load-icon.loading {
/* line 121, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading {
pointer-events: none;
margin-left: 6px; }
/* line 120, ../sass/search/_search.scss */
.search-holder .search .load-icon.loading .title-label {
/* 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 130, ../sass/search/_search.scss */
.search-holder .search .load-icon.loading .wait-spinner {
margin-left: 6px; }
/* line 135, ../sass/search/_search.scss */
.search-holder .search .load-icon:not(.loading) {
cursor: pointer; }
.search-holder .search .search-scroll .load-icon.loading .wait-spinner {
margin-left: 6px; }
/* line 140, ../sass/search/_search.scss */
.search-holder .search .load-more-button {
.search-holder .search .search-scroll .load-icon:not(.loading) {
cursor: pointer; }
/* line 145, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-more-button {
margin-top: 5px;
margin-bottom: 5px;
position: relative;
left: 25%;
width: 50%;
white-space: nowrap;
height: 20px;
line-height: 11px;
font-size: 0.7em; }

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

@@ -30,15 +30,20 @@
padding-right: $rightPadding;
top: 23px;
// Align with the top of the divider bar, below create button
margin-top: 10px;
.search {
//height: auto;
//overflow: auto;
.search-input {
// Align with the top of the divider bar, below create button
margin-top: 10px;
width: 100%;
}
.search-scroll {
height: 100%;
overflow: auto;
.results {
// Spacing away from the search input
margin-top: 10px;
@@ -146,12 +151,15 @@
position: relative;
left: 25%;
width: 50%;
white-space: nowrap;
// Make smallish button
height: 20px;
line-height: 11px;
font-size: 0.7em;
}
// temp
//margin-bottom: 30px;
}
}
}

5
platform/search/res/templates/search.html
View File

@@ -35,6 +35,9 @@
</mct-control-->
</div>
<!-- This div exists to determine scroll bar location -->
<div class="search-scroll">
<!-- Results list -->
<div class="results">
<mct-representation key="'search-item'"
@@ -59,4 +62,6 @@
Load more
</button>
</div>
</div>
</div>