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

[Search] Less space above tree

Browse Source 
Removed the awkward spacing between the filetree
and the search bar. Now 'My Items' appears just
below the search bar.
Also added .search-holder to the sass, but haven't
done anything with it yet.
This commit is contained in:
shale
2015-07-23 09:25:10 -07:00
parent 501e426868
commit 8c08f7b93e
5 changed files with 127 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -700,10 +700,14 @@ mct-container {
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* line 27, ../sass/search/_layout.scss */
/* line 29, ../sass/search/_layout.scss */
.split-layout.vertical > .pane:first-child .holder {
position: relative; }
/* line 42, ../sass/search/_layout.scss */
.pane.treeview.left .tree-holder {
top: 0; }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space

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

@@ -271,25 +271,28 @@ ul.tree {
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* line 27, ../sass/search/_search.scss */
.search .search-input {
/* line 22, ../sass/search/_search.scss */
.search-holder {
overflow-y: auto; }
/* line 30, ../sass/search/_search.scss */
.search-holder .search .search-input {
margin-top: 10px;
width: 100%; }
/* line 33, ../sass/search/_search.scss */
.search .results {
/* line 36, ../sass/search/_search.scss */
.search-holder .search .results {
margin-top: 10px; }
/* line 37, ../sass/search/_search.scss */
.search .results .search-result-item {
/* line 40, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item {
margin-bottom: 5px;
background: #005177;
border-radius: 2px;
padding-top: 2px;
padding-bottom: 1px; }
/* line 47, ../sass/search/_search.scss */
.search .results .search-result-item .label {
/* line 50, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item .label {
margin-left: 6px; }
/* line 56, ../sass/search/_search.scss */
.search .results .search-result-item .label .title-label {
/* line 59, ../sass/search/_search.scss */
.search-holder .search .results .search-result-item .label .title-label {
display: inline-block;
position: absolute;
width: auto;
@@ -300,8 +303,8 @@ ul.tree {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 79, ../sass/search/_search.scss */
.search .load-more-button {
/* line 82, ../sass/search/_search.scss */
.search-holder .search .load-more-button {
margin-top: 5px;
position: relative;
left: 25%;

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

@@ -20,6 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
// Overrides some styling in user-environ/_layout.scss
.split-layout {
&.vertical {
>.pane {
@@ -32,6 +34,14 @@
}
}
}
}
}
.pane {
&.treeview.left {
.tree-holder {
// Want tree holder to start right below the search bar
top: 0;
}
}
}

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

@@ -19,6 +19,9 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
.search-holder {
//position: relative;
overflow-y: auto; // This should make it scroll, but isn't wokring :(
.search {
$iconWidth: 20px;
@@ -91,3 +94,4 @@
font-size: 0.7em;
}
}
}

2
platform/features/search/res/templates/search.html
View File

@@ -38,7 +38,7 @@
</mct-representation>
</div>
<!-- Load more? -->
<!-- Load more -->
<div ng-if="controller.areMore()">
<button class="load-more-button btn very-subtle"
ng-click="controller.loadMore()">