[Mobile] IN PROGRESS: Re-orgs after merge of Shivam's mobile branch
open #74 Re-applied changes to browse.html; Added mobile/.../_search.scss; Removed unused mobile/search/layout.scss; Moved inclusion of search/_search.scss from tree.scss to main.scss;
This commit is contained in:
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -30,5 +30,4 @@
|
||||
@import "mixins";
|
||||
@import "mobile/mixins";
|
||||
@import "tree/tree";
|
||||
@import "search/search";
|
||||
@import "mobile/tree";
|
||||
|
||||
Reference in New Issue
Block a user