diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 6e6db9d1a4..dd97bbea3f 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -25,22 +25,24 @@
- - -
- - -
-
- - -
+
+ + +
+ + +
+
+ + +
+
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 9007cbbe1d..12ed7b12aa 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -4350,6 +4350,259 @@ input[type="text"] { right: 0; left: 0; } +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * 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 */ +.abs.search-holder, .btn-menu span.search-holder.l-click-area { + height: 25px; + bottom: 0; + top: 23px; + z-index: 5; } + /* line 27, ../sass/search/_search.scss */ + .abs.search-holder.active, .btn-menu span.search-holder.active.l-click-area { + height: auto; + bottom: 0; } + +/* line 38, ../sass/search/_search.scss */ +.search { + display: flex; + flex-direction: column; + height: 100%; } + /* line 49, ../sass/search/_search.scss */ + .search .search-bar { + font-size: 0.8em; + position: relative; + width: 100%; } + /* line 66, ../sass/search/_search.scss */ + .search .search-bar .search-input { + height: 25px; + line-height: 25px; + padding-top: 0; + padding-bottom: 0; } + /* line 73, ../sass/search/_search.scss */ + .search .search-bar .search-icon, + .search .search-bar .clear-icon, + .search .search-bar .menu-icon { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + color: #737373; + height: 17px; + width: 17px; + line-height: 17px; + position: absolute; + text-align: center; + top: 4px; } + /* line 86, ../sass/search/_search.scss */ + .search .search-bar .clear-icon, + .search .search-bar .menu-icon { + cursor: pointer; + transition: color .25s; } + /* line 93, ../sass/search/_search.scss */ + .search .search-bar .search-input { + position: relative; + width: 100%; + padding-left: 22px !important; + padding-right: 44px !important; } + /* line 100, ../sass/search/_search.scss */ + .search .search-bar .search-input input { + width: 100%; } + /* line 105, ../sass/search/_search.scss */ + .search .search-bar .search-icon { + color: #737373; + left: 3px; + transition: visibility .15s, opacity .15s, color .2s; + pointer-events: none; } + /* line 125, ../sass/search/_search.scss */ + .search .search-bar .search-input:hover + div.search-icon { + color: #a6a6a6; } + /* line 129, ../sass/search/_search.scss */ + .search .search-bar .clear-icon { + right: 22px; + visibility: hidden; + opacity: 0; + transition: visibility .15s, opacity .15s, color .2s; } + /* line 138, ../sass/search/_search.scss */ + .search .search-bar .clear-icon.content { + visibility: visible; + opacity: 1; } + /* line 143, ../sass/search/_search.scss */ + .search .search-bar .clear-icon:hover { + color: #a6a6a6; } + /* line 148, ../sass/search/_search.scss */ + .search .search-bar .menu-icon { + font-size: 0.8em; + padding-right: 4px; + right: 4px; + text-align: right; } + /* line 154, ../sass/search/_search.scss */ + .search .search-bar .menu-icon:hover { + color: #a6a6a6; } + /* line 159, ../sass/search/_search.scss */ + .search .search-bar .search-menu-holder { + float: right; + left: -20px; + z-index: 1; + transition: visibility .05s, opacity .05s; } + /* line 169, ../sass/search/_search.scss */ + .search .search-bar .search-menu-holder.off { + visibility: hidden; + opacity: 0; } + /* line 176, ../sass/search/_search.scss */ + .search .search-bar .menu-icon:hover + div.search-menu-holder { + visibility: visible; } + /* line 179, ../sass/search/_search.scss */ + .search .search-bar div.search-menu-holder:hover { + visibility: visible; } + /* line 184, ../sass/search/_search.scss */ + .search .active-filter-display { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + line-height: 130%; + padding: 5px 0; + padding-left: 1.4625em; + font-size: 0.65em; + margin-top: 3px; } + /* line 199, ../sass/search/_search.scss */ + .search .active-filter-display .clear-filters-icon { + opacity: 0.4; + font-size: 0.8em; + position: absolute; + left: 1px; + cursor: pointer; } + /* line 210, ../sass/search/_search.scss */ + .search .active-filter-display.off { + visibility: hidden; + opacity: 0; + height: 0; + margin: 0; + padding: 0; + border: 0; } + /* line 220, ../sass/search/_search.scss */ + .search .search-scroll { + order: 3; + margin-top: 4px; + overflow-y: auto; + top: auto; + height: auto; + max-height: 100%; + position: relative; } + /* line 235, ../sass/search/_search.scss */ + .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; + transition: background-color 0.25s; + margin-bottom: 2px; + border-radius: 2px; + padding-top: 4px; + padding-bottom: 2px; } + /* line 249, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item .label { + margin-left: 6px; } + /* line 253, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item .label .title-label { + display: inline-block; + position: absolute; + left: 29px; + right: 5px; + font-size: .8em; + line-height: 17px; + width: auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } + /* line 275, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item.selected { + background: #005177; + color: #fff; } + /* line 279, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item.selected .view-control { + color: #0099cc; } + /* line 282, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item.selected .label .type-icon { + color: #fff; } + /* line 287, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item .label .type-icon .l-icon-link { + text-shadow: black 0 1px 2px; + z-index: 2; + color: #49dedb; + font-size: 8px; + line-height: 8px; + height: 8px; + width: 8px; + margin-left: -25px; } + /* line 296, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item:not(.selected):hover { + background: #404040; + color: #cccccc; } + /* line 299, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger { + display: block; } + /* line 302, ../sass/search/_search.scss */ + .search .search-scroll .results .search-result-item:not(.selected):hover .icon { + color: #33ccff; } + /* line 310, ../sass/search/_search.scss */ + .search .search-scroll .load-icon { + position: relative; } + /* line 312, ../sass/search/_search.scss */ + .search .search-scroll .load-icon.loading { + pointer-events: none; + margin-left: 6px; } + /* line 316, ../sass/search/_search.scss */ + .search .search-scroll .load-icon.loading .title-label { + font-style: italic; + font-size: .9em; + opacity: 0.5; + margin-left: 26px; + line-height: 24px; } + /* line 326, ../sass/search/_search.scss */ + .search .search-scroll .load-icon.loading .wait-spinner { + margin-left: 6px; } + /* line 331, ../sass/search/_search.scss */ + .search .search-scroll .load-icon:not(.loading) { + cursor: pointer; } + /* line 336, ../sass/search/_search.scss */ + .search .search-scroll .load-more-button { + margin-top: 5px 0; + font-size: 0.8em; + position: relative; + left: 50%; + margin-left: -45px; + text-align: center; + width: 90px; + white-space: nowrap; } + +@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { + /* line 5, ../sass/mobile/search/_search.scss */ + .search .search-bar .menu-icon { + display: none; } + /* line 8, ../sass/mobile/search/_search.scss */ + .search .search-bar .clear-icon { + right: 5px; } } /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 9bf108bc36..701433a525 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -304,252 +304,6 @@ ul.tree { ul.tree ul.tree { margin-left: 15px; } -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * 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 */ -.abs.search-holder { - height: 25px; - bottom: 0; - top: 23px; - z-index: 5; } - /* line 27, ../sass/search/_search.scss */ - .abs.search-holder.active { - height: auto; - bottom: 0; } - -/* line 38, ../sass/search/_search.scss */ -.search { - display: flex; - flex-direction: column; - height: 100%; } - /* line 49, ../sass/search/_search.scss */ - .search .search-bar { - font-size: 0.8em; - position: relative; - width: 100%; } - /* line 66, ../sass/search/_search.scss */ - .search .search-bar .search-input { - height: 25px; - line-height: 25px; - padding-top: 0; - padding-bottom: 0; } - /* line 73, ../sass/search/_search.scss */ - .search .search-bar .search-icon, - .search .search-bar .clear-icon, - .search .search-bar .menu-icon { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: #737373; - height: 17px; - width: 17px; - line-height: 17px; - position: absolute; - text-align: center; - top: 4px; } - /* line 86, ../sass/search/_search.scss */ - .search .search-bar .clear-icon, - .search .search-bar .menu-icon { - cursor: pointer; - transition: color .25s; } - /* line 93, ../sass/search/_search.scss */ - .search .search-bar .search-input { - position: relative; - width: 100%; - padding-left: 22px !important; - padding-right: 44px !important; } - /* line 100, ../sass/search/_search.scss */ - .search .search-bar .search-input input { - width: 100%; } - /* line 105, ../sass/search/_search.scss */ - .search .search-bar .search-icon { - color: #737373; - left: 3px; - transition: visibility .15s, opacity .15s, color .2s; - pointer-events: none; } - /* line 125, ../sass/search/_search.scss */ - .search .search-bar .search-input:hover + div.search-icon { - color: #a6a6a6; } - /* line 129, ../sass/search/_search.scss */ - .search .search-bar .clear-icon { - right: 22px; - visibility: hidden; - opacity: 0; - transition: visibility .15s, opacity .15s, color .2s; } - /* line 138, ../sass/search/_search.scss */ - .search .search-bar .clear-icon.content { - visibility: visible; - opacity: 1; } - /* line 143, ../sass/search/_search.scss */ - .search .search-bar .clear-icon:hover { - color: #a6a6a6; } - /* line 148, ../sass/search/_search.scss */ - .search .search-bar .menu-icon { - font-size: 0.8em; - padding-right: 4px; - right: 4px; - text-align: right; } - /* line 154, ../sass/search/_search.scss */ - .search .search-bar .menu-icon:hover { - color: #a6a6a6; } - /* line 159, ../sass/search/_search.scss */ - .search .search-bar .search-menu-holder { - float: right; - left: -20px; - z-index: 1; - transition: visibility .05s, opacity .05s; } - /* line 169, ../sass/search/_search.scss */ - .search .search-bar .search-menu-holder.off { - visibility: hidden; - opacity: 0; } - /* line 176, ../sass/search/_search.scss */ - .search .search-bar .menu-icon:hover + div.search-menu-holder { - visibility: visible; } - /* line 179, ../sass/search/_search.scss */ - .search .search-bar div.search-menu-holder:hover { - visibility: visible; } - /* line 184, ../sass/search/_search.scss */ - .search .active-filter-display { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - line-height: 130%; - padding: 5px 0; - padding-left: 1.4625em; - font-size: 0.65em; - margin-top: 3px; } - /* line 199, ../sass/search/_search.scss */ - .search .active-filter-display .clear-filters-icon { - opacity: 0.4; - font-size: 0.8em; - position: absolute; - left: 1px; - cursor: pointer; } - /* line 210, ../sass/search/_search.scss */ - .search .active-filter-display.off { - visibility: hidden; - opacity: 0; - height: 0; - margin: 0; - padding: 0; - border: 0; } - /* line 220, ../sass/search/_search.scss */ - .search .search-scroll { - order: 3; - margin-top: 4px; - overflow-y: auto; - top: auto; - height: auto; - max-height: 100%; - position: relative; } - /* line 235, ../sass/search/_search.scss */ - .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; - transition: background-color 0.25s; - margin-bottom: 2px; - border-radius: 2px; - padding-top: 4px; - padding-bottom: 2px; } - /* line 249, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item .label { - margin-left: 6px; } - /* line 253, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item .label .title-label { - display: inline-block; - position: absolute; - left: 29px; - right: 5px; - font-size: .8em; - line-height: 17px; - width: auto; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } - /* line 275, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item.selected { - background: #005177; - color: #fff; } - /* line 279, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item.selected .view-control { - color: #0099cc; } - /* line 282, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item.selected .label .type-icon { - color: #fff; } - /* line 287, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item .label .type-icon .l-icon-link { - text-shadow: black 0 1px 2px; - z-index: 2; - color: #49dedb; - font-size: 8px; - line-height: 8px; - height: 8px; - width: 8px; - margin-left: -25px; } - /* line 296, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item:not(.selected):hover { - background: #404040; - color: #cccccc; } - /* line 299, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger { - display: block; } - /* line 302, ../sass/search/_search.scss */ - .search .search-scroll .results .search-result-item:not(.selected):hover .icon { - color: #33ccff; } - /* line 310, ../sass/search/_search.scss */ - .search .search-scroll .load-icon { - position: relative; } - /* line 312, ../sass/search/_search.scss */ - .search .search-scroll .load-icon.loading { - pointer-events: none; - margin-left: 6px; } - /* line 316, ../sass/search/_search.scss */ - .search .search-scroll .load-icon.loading .title-label { - font-style: italic; - font-size: .9em; - opacity: 0.5; - margin-left: 26px; - line-height: 24px; } - /* line 326, ../sass/search/_search.scss */ - .search .search-scroll .load-icon.loading .wait-spinner { - margin-left: 6px; } - /* line 331, ../sass/search/_search.scss */ - .search .search-scroll .load-icon:not(.loading) { - cursor: pointer; } - /* line 336, ../sass/search/_search.scss */ - .search .search-scroll .load-more-button { - margin-top: 5px 0; - font-size: 0.8em; - position: relative; - left: 50%; - margin-left: -45px; - text-align: center; - width: 90px; - white-space: nowrap; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 1dda9770ce..eff854790b 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -61,6 +61,8 @@ @import "forms/datetime"; @import "forms/filter"; @import "plots/plots-main"; +@import "search/search"; +@import "mobile/search/search"; @import "overlay/overlay"; @import "mobile/overlay/overlay"; @import "user-environ/frame"; diff --git a/platform/commonUI/general/res/sass/mobile/search/_search.scss b/platform/commonUI/general/res/sass/mobile/search/_search.scss new file mode 100644 index 0000000000..d37514a0a5 --- /dev/null +++ b/platform/commonUI/general/res/sass/mobile/search/_search.scss @@ -0,0 +1,13 @@ +@include phone { + .search { + .search-bar { + // Hide menu-icon and adjust spacing when in phone mode + .menu-icon { + display: none; + } + .clear-icon { + right: $interiorMargin; + } + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/search/_layout.scss b/platform/commonUI/general/res/sass/search/_layout.scss deleted file mode 100644 index 03612d2d3c..0000000000 --- a/platform/commonUI/general/res/sass/search/_layout.scss +++ /dev/null @@ -1,31 +0,0 @@ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ - -// Overrides some styling in user-environ/_layout.scss -.pane { - &.treeview.left { - .tree-holder { - // Want tree holder to start right below the search bar. - top: 60px; - } - } -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/tree.scss b/platform/commonUI/general/res/sass/tree.scss index d4fea6e8b6..5a28f94641 100644 --- a/platform/commonUI/general/res/sass/tree.scss +++ b/platform/commonUI/general/res/sass/tree.scss @@ -30,5 +30,4 @@ @import "mixins"; @import "mobile/mixins"; @import "tree/tree"; -@import "search/search"; @import "mobile/tree";