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

[Search] Colors and positioning

Browse Source 
Corrected the colors back to the normal
style. Also made the text on the same
line as the icon, but this fix is a
temporary one.
This commit is contained in:
shale 2015-07-22 12:33:16 -07:00
parent ab3d3ec45b
commit 3ae681c79c
3 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,22 +271,20 @@ ul.tree {
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* line 23, ../sass/search/_search.scss */
span.searchbar {
color: #ff0099; }
/* line 26, ../sass/search/_search.scss */
span.searchbar .results {
color: #ff0000; }
/* line 31, ../sass/search/_search.scss */
span.searchbar .results .searchbar-item {
color: #8800ff; }
/* line 35, ../sass/search/_search.scss */
span.searchbar .results .searchbar-item .label {
color: #00aa00; }
/* line 38, ../sass/search/_search.scss */
span.searchbar .results .searchbar-item .label .title-label {
color: #aa00aa;
/* line 27, ../sass/search/_search.scss */
span.search-holder .searchbar {
width: 100%;
margin-top: 20px; }
/* line 44, ../sass/search/_search.scss */
span.search-holder .results .searchbar-item .label .title-label {
position: relative;
left: 20px;
top: -17px;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 58, ../sass/search/_search.scss */
span.search-holder .load-more-button {
width: 100%;
margin-top: 20px; }

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

@ -20,28 +20,33 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
span.searchbar {
color: #ff0099;
//@include menuUlReset();
span.search-holder {
$iconwidth: 20px;
$iconheight: 17px;
.searchbar {
width: 100%;
margin-top: 20px;
}
.results {
//display: block;
//position: relative;
color: #ff0000;
.searchbar-item {
$runningItemW: 0;
color: #8800ff;
//margin-top: 5px;
.label {
color: #00aa00;
.type-icon {
.icon {
}
}
.title-label {
color: #aa00aa;
position: relative;
left: $iconwidth;
top: -$iconheight;
//@include absPosDefault();
display: block;
//left: $runningItemW + ($interiorMargin * 3);
//left: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -49,4 +54,9 @@ span.searchbar {
}
}
}
.load-more-button {
width: 100%;
margin-top: 20px;
}
}

9
platform/features/search/res/templates/searchbar.html
View File

@ -19,14 +19,14 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<span class="searchbar"
<span class="search-holder"
ng-controller="SearchbarController as controller">
<!-- Search bar input -->
<div>
<input type="text"
<input class="searchbar"
id="searchbarinput"
type="text"
value=""
style="width: 100%"
ng-keyup="controller.search('searchbarinput')" />
</div>
@ -40,7 +40,8 @@
<!-- Load more? -->
<div ng-if="controller.areMore()">
<button ng-click="controller.loadMore()">
<button class="load-more-button"
ng-click="controller.loadMore()">
Load more
</button>
</div>