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

Merged latest from open-master and open1222 platform/

Browse Source
This commit is contained in:
Charles Hacskaylo
2015-06-08 16:00:24 -07:00
parent e216961727 3a36fda8ab
commit cec115976c
12 changed files with 370 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/general/res/sass/_constants.scss
View File

@@ -19,6 +19,10 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
// Features
$enableImageryThumbs: false; // Set to true if historical imagery thumbnails are supported
// Margins, spacing, radii
$bodyMargin: 10px;
$interiorMargin: 5px;

13
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@@ -199,6 +199,19 @@
}
}
.l-local-controls {
// Control shown when hovering over an object, like plots and imagery
// Default position is upper right
$p: $interiorMargin;
position: absolute;
top: $p; right: $p;
z-index: 5;
}
.s-local-controls {
font-size: 0.7rem;
}
.btn-set {
// Buttons that have a very tight conceptual grouping - no internal space between them.
display: inline-block;

104
platform/commonUI/general/res/sass/controls/_time-controller.scss Normal file
View File

@@ -0,0 +1,104 @@
.l-time-controller {
$inputTxtW: 90px;
$knobW: 9px;
$r1H: 20px;
$r2H: 30px;
$r3H: 10px;
position: relative;
margin: $interiorMarginLg 0;
min-width: 400px;
.l-time-range-inputs-holder,
.l-time-range-slider {
font-size: 0.8em;
}
.l-time-range-inputs-holder,
.l-time-range-slider-holder,
.l-time-range-ticks-holder
{
margin-bottom: $interiorMargin;
position: relative;
}
.l-time-range-slider,
.l-time-range-ticks {
//@include test(red, 0.1);
@include absPosDefault(0, visible);
}
.l-time-range-inputs-holder {
height: $r1H;
}
.l-time-range-slider,
.l-time-range-ticks {
left: $inputTxtW; right: $inputTxtW;
}
.l-time-range-slider-holder {
height: $r2H;
.range-holder {
@include box-shadow(none);
background: none;
border: none;
height: 75%;
}
}
.l-time-range-ticks-holder {
height: $r3H;
.l-time-range-ticks {
border-top: 1px solid $colorInteriorBorder;
.tick {
background-color: $colorInteriorBorder;
border:none;
width: 1px;
margin-left: -1px;
&:first-child {
margin-left: 0;
}
.l-time-range-tick-label {
color: lighten($colorInteriorBorder, 20%);
font-size: 0.7em;
position: absolute;
margin-left: -0.5 * $tickLblW;
text-align: center;
top: $r3H;
width: $tickLblW;
z-index: 2;
}
}
}
}
.knob {
width: $knobW;
.range-value {
$w: 75px;
//@include test();
position: absolute;
top: 50%;
margin-top: -7px; // Label is 13px high
white-space: nowrap;
width: $w;
}
&:hover .range-value {
color: $colorKey;
}
&.knob-l {
margin-left: $knobW / -2;
.range-value {
text-align: right;
right: $knobW + $interiorMargin;
}
}
&.knob-r {
margin-right: $knobW / -2;
.range-value {
left: $knobW + $interiorMargin;
}
}
}
}

19
platform/commonUI/general/res/sass/features/_imagery.scss
View File

@@ -10,7 +10,9 @@
/*************************************** MAIN LAYOUT */
.l-image-main-wrapper {
//@include test();
bottom: $interiorMargin*2 + $imageThumbsWrapperH;
@if $enableImageryThumbs == true {
bottom: $interiorMargin*2 + $imageThumbsWrapperH;
}
min-height: 100px;
min-width: 150px;
.l-image-main {
@@ -44,6 +46,10 @@
background-repeat: no-repeat;
}
.l-image-main {
cursor: crosshair;
}
.l-image-main-controlbar {
//@include test();
font-size: 0.8em;
@@ -72,7 +78,7 @@
display: inline-block;
//white-space: nowrap;
&:before {
content: "\000058";
content: "\000049";
}
}
.s-mag {
@@ -92,9 +98,6 @@
/*************************************** THUMBS */
.l-image-thumb-item {
}
.l-image-thumbs-wrapper {
//@include test(green);
direction: rtl;
@@ -156,8 +159,10 @@
.l-image-main-controlbar {
font-size: 0.7em;
}
.l-btn.show-thumbs {
display: inline-block;
@if $enableImageryThumbs == true {
.l-btn.show-thumbs {
display: inline-block;
}
}
}
.l-image-thumbs-wrapper {

30
platform/commonUI/general/res/sass/plots.scss
View File

@@ -1,30 +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.
*****************************************************************************/
@import "compass";
@import "compass/css3";
@import "compass/css3/border-radius";
@import "compass/css3/opacity";
@import "compass/utilities";
@import "constants";
@import "mixins";
@import "plots/plots-main";