Compare commits

...

3 Commits

Author SHA1 Message Date
2e5e32da22 [Frontend] Refining look of datetime inputs
open #201
New .complex-input CSS class; input inset
shadow defined as a global constant;
input padding moved out of _globals and
into _elems.scss;
2015-11-12 15:04:13 -08:00
9a18d73aa2 [Frontend] Fixed scrolling view
open #201
Conversion layout of time-controller to use flexbox;
2015-11-12 13:53:29 -08:00
6c4bdcad81 [Frontend] Fixed scrolling view
open #201
Cherry-pick this to open199d
Removed fixed-header class from table markup;
2015-11-12 13:21:47 -08:00
12 changed files with 217 additions and 187 deletions

View File

@ -144,4 +144,8 @@
.flex-justify-end {
@include justify-content(flex-end);
}
.flex-row-align-center {
@include align-items(center);
}

View File

@ -111,6 +111,7 @@ $menuLineHPx: 24px;
$btnStdH: 25px;
$btnToolbarH: $btnStdH;
$btnFrameH: 16px;
$inputInsetShdw: inset rgba(black, 0.4) 0 1px 3px;
/************************** PATHS */
// Paths need to be relative to /platform/commonUI/theme/<theme-name>/css/ directory

View File

@ -65,11 +65,6 @@ input, textarea {
font-family: Helvetica, Arial, sans-serif;
}
input[type="text"] {
vertical-align: baseline;
padding: 3px 5px !important;
}
h1, h2, h3 {
margin: 0;
}

View File

@ -319,13 +319,13 @@
@include appearance(none);
@include border-radius($controlCr);
@include box-sizing(border-box);
@include box-shadow(inset rgba(black, 0.4) 0 1px 3px);
@include box-shadow($inputInsetShdw);
background: $bg;
border: none;
color: $fg;
outline: none;
&.error {
background: rgba(red, 0.5);
background: rgba(red, 0.5) !important;
}
}

View File

@ -18,27 +18,22 @@ mct-include.l-time-controller {
$r2H: nth($ueTimeControlH,2);
$r3H: nth($ueTimeControlH,3);
//@include absPosDefault();
//@include test();
display: block;
//top: auto;
height: $r1H + $r2H + $r3H + ($interiorMargin * 2);
min-width: $minW;
font-size: 0.8rem;
.l-time-range-inputs-holder,
/* .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
{
//@include test();
@include absPosDefault(0, visible);
@include box-sizing(border-box);
top: auto;
}
.l-time-range-slider,
.l-time-range-ticks {
@ -49,7 +44,8 @@ mct-include.l-time-controller {
.l-time-range-inputs-holder {
//@include test(red);
height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
//height: $r1H;
//line-height: $r1H;
padding-top: $interiorMargin;
border-top: 1px solid $colorInteriorBorder;
.type-icon {
@ -71,7 +67,7 @@ mct-include.l-time-controller {
.l-time-range-slider-holder {
//@include test(green);
height: $r2H; bottom: $r3H + ($interiorMarginSm * 1);
height: $r2H;
.range-holder {
@include box-shadow(none);
background: none;
@ -114,7 +110,6 @@ mct-include.l-time-controller {
}
}
&:not(:active) {
//@include test(#ff00cc);
.knob,
.range {
@include transition-property(left, right);
@ -155,7 +150,6 @@ mct-include.l-time-controller {
.knob {
z-index: 2;
.range-value {
//@include test($sliderColorRange);
@include trans-prop-nice-fade(.25s);
padding: 0 $rangeValOffset;
position: absolute;
@ -167,7 +161,6 @@ mct-include.l-time-controller {
color: $sliderColorKnobHov;
}
&.knob-l {
//@include border-bottom-left-radius($knobCr); // MOVED TO _CONTROLS.SCSS
margin-left: $knobM;
.range-value {
text-align: right;
@ -175,7 +168,6 @@ mct-include.l-time-controller {
}
}
&.knob-r {
//@include border-bottom-right-radius($knobCr);
margin-right: $knobM;
.range-value {
left: $rangeValOffset;
@ -187,12 +179,7 @@ mct-include.l-time-controller {
}
}
//.slot.range-holder {
// background-color: $sliderColorRangeHolder;
//}
.s-time-range-val {
//@include test();
@include border-radius($controlCr);
background-color: $colorInputBg;
padding: 1px 1px 0 $interiorMargin;

View File

@ -164,16 +164,30 @@ label.form-control.checkbox {
input[type="text"] {
@include nice-input($colorInputBg, $colorInputFg);
&.filter {
&.ng-dirty {
// background: red;
}
}
vertical-align: baseline;
padding: 3px 5px;
&.numeric {
text-align: right;
}
}
.complex-input {
// Holder that looks like an input,
// and holds a text input plus other elements
@include border-radius($controlCr);
@include box-sizing(border-box);
@include box-shadow($inputInsetShdw);
background: $colorInputBg;
display: inline-block;
padding: 3px 5px 3px 3px;
input[type="text"] {
//@include test();
@include box-shadow(none);
background: none;
padding: 1px 3px;
}
}
textarea {
@include nice-textarea($colorInputBg, $colorInputFg);
// font-size: 0.9em;

View File

@ -1,5 +1,4 @@
<span class="s-btn"
ng-controller="DateTimeFieldController">
<span ng-controller="DateTimeFieldController" class="complex-input">
<input type="text"
ng-model="textValue"
ng-class="{ error: textInvalid }">

View File

@ -19,10 +19,10 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<div ng-controller="TimeRangeController">
<div class="l-time-range-inputs-holder">
<span class="l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span>
<span class="l-time-range-input">
<div ng-controller="TimeRangeController" class="l-flex-col">
<div class="holder l-flex-row flex-elem flex-row-align-center l-time-range-inputs-holder">
<span class="flex-elem l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span>
<span class="flex-elem l-time-range-input">
<mct-control key="'datetime-field'"
structure="{ format: parameters.format }"
ng-model="ngModel.outer"
@ -31,19 +31,19 @@
</mct-control>
</span>
<span class="l-time-range-inputs-elem lbl">to</span>
<span class="flex-elem l-time-range-inputs-elem lbl">to</span>
<span class="l-time-range-input" ng-controller="ToggleController as t2">
<span class="flex-elem l-time-range-input" ng-controller="ToggleController as t2">
<mct-control key="'datetime-field'"
structure="{ format: parameters.format }"
ng-model="ngModel.outer"
field="'end'"
class="time-range-end">
</mct-control>&nbsp;
</mct-control>
</span>
</div>
<div class="l-time-range-slider-holder">
<div class="flex-elem holder l-time-range-slider-holder">
<div class="l-time-range-slider">
<div class="slider"
mct-resize="spanWidth = bounds.width">
@ -71,7 +71,7 @@
</div>
</div>
<div class="l-time-range-ticks-holder">
<div class="flex-elem holder l-time-range-ticks-holder">
<div class="l-time-range-ticks">
<div
ng-repeat="tick in ticks track by $index"

View File

@ -348,15 +348,10 @@ input, textarea {
font-family: Helvetica, Arial, sans-serif; }
/* line 68, ../../../../general/res/sass/_global.scss */
input[type="text"] {
vertical-align: baseline;
padding: 3px 5px !important; }
/* line 73, ../../../../general/res/sass/_global.scss */
h1, h2, h3 {
margin: 0; }
/* line 77, ../../../../general/res/sass/_global.scss */
/* line 72, ../../../../general/res/sass/_global.scss */
h1 {
font-size: 1.7em;
font-weight: normal !important;
@ -364,15 +359,15 @@ h1 {
margin-bottom: 20px;
margin-top: 0; }
/* line 85, ../../../../general/res/sass/_global.scss */
/* line 80, ../../../../general/res/sass/_global.scss */
p {
margin-bottom: 10px; }
/* line 89, ../../../../general/res/sass/_global.scss */
/* line 84, ../../../../general/res/sass/_global.scss */
mct-container {
display: block; }
/* line 93, ../../../../general/res/sass/_global.scss */
/* line 88, ../../../../general/res/sass/_global.scss */
.abs, .l-inspect, .l-datetime-picker .l-month-year-pager .pager,
.l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area, .l-object-wrapper, .l-object-wrapper .object-holder-main {
position: absolute;
@ -383,57 +378,57 @@ mct-container {
height: auto;
width: auto; }
/* line 103, ../../../../general/res/sass/_global.scss */
/* line 98, ../../../../general/res/sass/_global.scss */
.code, .codehilite {
font-family: "Lucida Console", monospace;
font-size: 0.7em;
line-height: 150%;
white-space: pre; }
/* line 110, ../../../../general/res/sass/_global.scss */
/* line 105, ../../../../general/res/sass/_global.scss */
.codehilite {
background-color: rgba(153, 153, 153, 0.1);
padding: 1em; }
/* line 116, ../../../../general/res/sass/_global.scss */
/* line 111, ../../../../general/res/sass/_global.scss */
.align-right {
text-align: right; }
/* line 120, ../../../../general/res/sass/_global.scss */
/* line 115, ../../../../general/res/sass/_global.scss */
.centered {
text-align: center; }
/* line 124, ../../../../general/res/sass/_global.scss */
/* line 119, ../../../../general/res/sass/_global.scss */
.ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 128, ../../../../general/res/sass/_global.scss */
/* line 123, ../../../../general/res/sass/_global.scss */
.scrolling,
.scroll {
overflow: auto; }
/* line 133, ../../../../general/res/sass/_global.scss */
/* line 128, ../../../../general/res/sass/_global.scss */
.vscroll {
overflow-y: auto; }
/* line 137, ../../../../general/res/sass/_global.scss */
/* line 132, ../../../../general/res/sass/_global.scss */
.no-margin {
margin: 0; }
/* line 141, ../../../../general/res/sass/_global.scss */
/* line 136, ../../../../general/res/sass/_global.scss */
.ds {
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px;
box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; }
/* line 145, ../../../../general/res/sass/_global.scss */
/* line 140, ../../../../general/res/sass/_global.scss */
.hide,
.hidden {
display: none !important; }
/* line 150, ../../../../general/res/sass/_global.scss */
/* line 145, ../../../../general/res/sass/_global.scss */
.off {
visibility: hidden;
opacity: 0;
@ -443,7 +438,7 @@ mct-container {
border: 0;
margin: 0 !important; }
/* line 160, ../../../../general/res/sass/_global.scss */
/* line 155, ../../../../general/res/sass/_global.scss */
.sep {
color: rgba(255, 255, 255, 0.2); }
@ -607,6 +602,11 @@ mct-container {
-webkit-justify-content: flex-end;
justify-content: flex-end; }
/* line 149, ../../../../general/res/sass/_archetypes.scss */
.flex-row-align-center {
-webkit-align-items: center;
align-items: center; }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
@ -3463,26 +3463,20 @@ label.checkbox.custom {
/* line 9, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller {
display: block;
height: 83px;
min-width: 500px;
font-size: 0.8rem; }
/* line 34, ../../../../general/res/sass/controls/_time-controller.scss */
font-size: 0.8rem;
/* .l-time-range-inputs-holder,
.l-time-range-slider {
//font-size: 0.8em;
}*/ }
/* line 31, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder,
mct-include.l-time-controller .l-time-range-slider-holder,
mct-include.l-time-controller .l-time-range-ticks-holder {
overflow: visible;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: auto;
height: auto;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
top: auto; }
/* line 43, ../../../../general/res/sass/controls/_time-controller.scss */
box-sizing: border-box; }
/* line 38, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider,
mct-include.l-time-controller .l-time-range-ticks {
overflow: visible;
@ -3495,25 +3489,23 @@ mct-include.l-time-controller {
height: auto;
left: 150px;
right: 150px; }
/* line 50, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 45, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder {
height: 33px;
bottom: 46px;
padding-top: 5px;
border-top: 1px solid rgba(153, 153, 153, 0.1); }
/* line 55, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 51, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .type-icon {
font-size: 120%;
vertical-align: middle; }
/* line 59, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 55, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem {
margin-right: 5px; }
/* line 62, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 58, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .lbl,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl {
color: #666666; }
/* line 65, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 61, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .t-item-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .s-icon-btn.t-item-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .pager.t-item-icon, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .pager.t-item-icon,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .t-item-icon,
@ -3525,18 +3517,17 @@ mct-include.l-time-controller {
.l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .pager.t-item-icon {
font-size: 11px;
width: 11px; }
/* line 72, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 68, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder {
height: 20px;
bottom: 23px; }
/* line 75, ../../../../general/res/sass/controls/_time-controller.scss */
height: 20px; }
/* line 71, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
background: none;
border: none; }
/* line 80, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 76, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line {
-moz-transform: translateX(50%);
-ms-transform: translateX(50%);
@ -3550,19 +3541,19 @@ mct-include.l-time-controller {
width: 8px;
height: auto;
z-index: 2; }
/* line 90, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 86, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after {
background-color: #00c2ff;
content: "";
position: absolute; }
/* line 96, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 92, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before {
top: 0;
right: auto;
bottom: -10px;
left: 3px;
width: 2px; }
/* line 102, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 98, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after {
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
@ -3580,7 +3571,7 @@ mct-include.l-time-controller {
/* line 3, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:after {
background-color: #fff; }
/* line 118, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 113, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .knob,
mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .range {
-moz-transition-property: left, right;
@ -3595,13 +3586,13 @@ mct-include.l-time-controller {
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
transition-timing-function: ease-in-out; }
/* line 127, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 122, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder {
height: 20px; }
/* line 129, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 124, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks {
border-top: 1px solid rgba(255, 255, 255, 0.2); }
/* line 131, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 126, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick {
background-color: rgba(255, 255, 255, 0.2);
border: none;
@ -3609,10 +3600,10 @@ mct-include.l-time-controller {
width: 1px;
margin-left: -1px;
position: absolute; }
/* line 138, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 133, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child {
margin-left: 0; }
/* line 141, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 136, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label {
transform: translateX(-50%);
-webkit-transform: translateX(-50%);
@ -3623,10 +3614,10 @@ mct-include.l-time-controller {
top: 8px;
white-space: nowrap;
z-index: 2; }
/* line 155, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 150, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob {
z-index: 2; }
/* line 157, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 152, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob .range-value {
-moz-transition-property: opacity, background-color, border-color, color;
-o-transition-property: opacity, background-color, border-color, color;
@ -3649,27 +3640,27 @@ mct-include.l-time-controller {
height: 20px;
line-height: 20px;
white-space: nowrap; }
/* line 166, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 160, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob:hover .range-value {
color: #0099cc; }
/* line 169, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 163, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-l {
margin-left: -10px; }
/* line 172, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 165, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-l .range-value {
text-align: right;
right: 10px; }
/* line 177, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 170, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-r {
margin-right: -10px; }
/* line 180, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 172, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-r .range-value {
left: 10px; }
/* line 3, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:before, mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:after {
background-color: #fff; }
/* line 194, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 182, ../../../../general/res/sass/controls/_time-controller.scss */
.s-time-range-val {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
@ -3833,7 +3824,7 @@ mct-include.l-time-controller {
height: 150px; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
.form .form-row .selector-list.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/* line 124, ../../../../general/res/sass/forms/_elems.scss */
.form .form-row .selector-list > .wrapper {
overflow: auto;
@ -3887,15 +3878,39 @@ input[type="text"] {
border: none;
color: #cccccc;
outline: none;
padding: 0 3px; }
padding: 0 3px;
vertical-align: baseline;
padding: 3px 5px; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
input[type="text"].error {
background: rgba(255, 0, 0, 0.5); }
/* line 172, ../../../../general/res/sass/forms/_elems.scss */
background: rgba(255, 0, 0, 0.5) !important; }
/* line 169, ../../../../general/res/sass/forms/_elems.scss */
input[type="text"].numeric {
text-align: right; }
/* line 177, ../../../../general/res/sass/forms/_elems.scss */
/* line 174, ../../../../general/res/sass/forms/_elems.scss */
.complex-input {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
-moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px;
-webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px;
box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px;
background: rgba(255, 255, 255, 0.1);
display: inline-block;
padding: 3px 5px 3px 3px; }
/* line 183, ../../../../general/res/sass/forms/_elems.scss */
.complex-input input[type="text"] {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
background: none;
padding: 1px 3px; }
/* line 191, ../../../../general/res/sass/forms/_elems.scss */
textarea {
-moz-appearance: none;
-webkit-appearance: none;
@ -3918,7 +3933,7 @@ textarea {
width: 100%; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
textarea.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
@ -4066,7 +4081,7 @@ textarea {
padding: 5px; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
.channel-selector .treeview.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/* line 36, ../../../../general/res/sass/forms/_channel-selector.scss */
.channel-selector .btns-add-remove {
margin-top: 150px; }
@ -4235,7 +4250,7 @@ span.req {
.filter input.t-filter-input.error,
.t-filter input.filter.error,
.t-filter input.t-filter-input.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/* line 28, ../../../../general/res/sass/forms/_filter.scss */
.filter input.t-filter-input,
.t-filter input.t-filter-input {

View File

@ -348,15 +348,10 @@ input, textarea {
font-family: Helvetica, Arial, sans-serif; }
/* line 68, ../../../../general/res/sass/_global.scss */
input[type="text"] {
vertical-align: baseline;
padding: 3px 5px !important; }
/* line 73, ../../../../general/res/sass/_global.scss */
h1, h2, h3 {
margin: 0; }
/* line 77, ../../../../general/res/sass/_global.scss */
/* line 72, ../../../../general/res/sass/_global.scss */
h1 {
font-size: 1.7em;
font-weight: normal !important;
@ -364,15 +359,15 @@ h1 {
margin-bottom: 20px;
margin-top: 0; }
/* line 85, ../../../../general/res/sass/_global.scss */
/* line 80, ../../../../general/res/sass/_global.scss */
p {
margin-bottom: 10px; }
/* line 89, ../../../../general/res/sass/_global.scss */
/* line 84, ../../../../general/res/sass/_global.scss */
mct-container {
display: block; }
/* line 93, ../../../../general/res/sass/_global.scss */
/* line 88, ../../../../general/res/sass/_global.scss */
.abs, .l-inspect, .l-datetime-picker .l-month-year-pager .pager,
.l-datetime-picker .l-month-year-pager .val, .s-menu-btn span.l-click-area, .l-object-wrapper, .l-object-wrapper .object-holder-main {
position: absolute;
@ -383,57 +378,57 @@ mct-container {
height: auto;
width: auto; }
/* line 103, ../../../../general/res/sass/_global.scss */
/* line 98, ../../../../general/res/sass/_global.scss */
.code, .codehilite {
font-family: "Lucida Console", monospace;
font-size: 0.7em;
line-height: 150%;
white-space: pre; }
/* line 110, ../../../../general/res/sass/_global.scss */
/* line 105, ../../../../general/res/sass/_global.scss */
.codehilite {
background-color: rgba(102, 102, 102, 0.1);
padding: 1em; }
/* line 116, ../../../../general/res/sass/_global.scss */
/* line 111, ../../../../general/res/sass/_global.scss */
.align-right {
text-align: right; }
/* line 120, ../../../../general/res/sass/_global.scss */
/* line 115, ../../../../general/res/sass/_global.scss */
.centered {
text-align: center; }
/* line 124, ../../../../general/res/sass/_global.scss */
/* line 119, ../../../../general/res/sass/_global.scss */
.ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 128, ../../../../general/res/sass/_global.scss */
/* line 123, ../../../../general/res/sass/_global.scss */
.scrolling,
.scroll {
overflow: auto; }
/* line 133, ../../../../general/res/sass/_global.scss */
/* line 128, ../../../../general/res/sass/_global.scss */
.vscroll {
overflow-y: auto; }
/* line 137, ../../../../general/res/sass/_global.scss */
/* line 132, ../../../../general/res/sass/_global.scss */
.no-margin {
margin: 0; }
/* line 141, ../../../../general/res/sass/_global.scss */
/* line 136, ../../../../general/res/sass/_global.scss */
.ds {
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px;
box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; }
/* line 145, ../../../../general/res/sass/_global.scss */
/* line 140, ../../../../general/res/sass/_global.scss */
.hide,
.hidden {
display: none !important; }
/* line 150, ../../../../general/res/sass/_global.scss */
/* line 145, ../../../../general/res/sass/_global.scss */
.off {
visibility: hidden;
opacity: 0;
@ -443,7 +438,7 @@ mct-container {
border: 0;
margin: 0 !important; }
/* line 160, ../../../../general/res/sass/_global.scss */
/* line 155, ../../../../general/res/sass/_global.scss */
.sep {
color: rgba(255, 255, 255, 0.2); }
@ -607,6 +602,11 @@ mct-container {
-webkit-justify-content: flex-end;
justify-content: flex-end; }
/* line 149, ../../../../general/res/sass/_archetypes.scss */
.flex-row-align-center {
-webkit-align-items: center;
align-items: center; }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
@ -3402,26 +3402,20 @@ label.checkbox.custom {
/* line 9, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller {
display: block;
height: 83px;
min-width: 500px;
font-size: 0.8rem; }
/* line 34, ../../../../general/res/sass/controls/_time-controller.scss */
font-size: 0.8rem;
/* .l-time-range-inputs-holder,
.l-time-range-slider {
//font-size: 0.8em;
}*/ }
/* line 31, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder,
mct-include.l-time-controller .l-time-range-slider-holder,
mct-include.l-time-controller .l-time-range-ticks-holder {
overflow: visible;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: auto;
height: auto;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
top: auto; }
/* line 43, ../../../../general/res/sass/controls/_time-controller.scss */
box-sizing: border-box; }
/* line 38, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider,
mct-include.l-time-controller .l-time-range-ticks {
overflow: visible;
@ -3434,25 +3428,23 @@ mct-include.l-time-controller {
height: auto;
left: 150px;
right: 150px; }
/* line 50, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 45, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder {
height: 33px;
bottom: 46px;
padding-top: 5px;
border-top: 1px solid rgba(102, 102, 102, 0.2); }
/* line 55, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 51, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .type-icon {
font-size: 120%;
vertical-align: middle; }
/* line 59, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 55, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem {
margin-right: 5px; }
/* line 62, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 58, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .lbl,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .lbl {
color: #999999; }
/* line 65, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 61, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .ui-symbol.icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .t-item-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.s-icon-btn, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .s-icon-btn.t-item-icon, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .icon.pager, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .icon.pager, mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .l-datetime-picker .l-month-year-pager .pager.t-item-icon, .l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-input .pager.t-item-icon,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .ui-symbol.icon,
mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .t-item-icon,
@ -3464,18 +3456,17 @@ mct-include.l-time-controller {
.l-datetime-picker .l-month-year-pager mct-include.l-time-controller .l-time-range-inputs-holder .l-time-range-inputs-elem .pager.t-item-icon {
font-size: 11px;
width: 11px; }
/* line 72, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 68, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder {
height: 20px;
bottom: 23px; }
/* line 75, ../../../../general/res/sass/controls/_time-controller.scss */
height: 20px; }
/* line 71, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
background: none;
border: none; }
/* line 80, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 76, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line {
-moz-transform: translateX(50%);
-ms-transform: translateX(50%);
@ -3489,19 +3480,19 @@ mct-include.l-time-controller {
width: 8px;
height: auto;
z-index: 2; }
/* line 90, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 86, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after {
background-color: #666;
content: "";
position: absolute; }
/* line 96, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 92, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:before {
top: 0;
right: auto;
bottom: -10px;
left: 3px;
width: 2px; }
/* line 102, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 98, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range .toi-line:after {
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
@ -3519,7 +3510,7 @@ mct-include.l-time-controller {
/* line 3, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:before, mct-include.l-time-controller .l-time-range-slider-holder .range-holder .range:hover .toi-line:after {
background-color: #0052b5; }
/* line 118, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 113, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .knob,
mct-include.l-time-controller .l-time-range-slider-holder:not(:active) .range {
-moz-transition-property: left, right;
@ -3534,13 +3525,13 @@ mct-include.l-time-controller {
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
transition-timing-function: ease-in-out; }
/* line 127, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 122, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder {
height: 20px; }
/* line 129, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 124, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks {
border-top: 1px solid rgba(0, 0, 0, 0.2); }
/* line 131, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 126, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick {
background-color: rgba(0, 0, 0, 0.2);
border: none;
@ -3548,10 +3539,10 @@ mct-include.l-time-controller {
width: 1px;
margin-left: -1px;
position: absolute; }
/* line 138, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 133, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child {
margin-left: 0; }
/* line 141, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 136, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label {
transform: translateX(-50%);
-webkit-transform: translateX(-50%);
@ -3562,10 +3553,10 @@ mct-include.l-time-controller {
top: 8px;
white-space: nowrap;
z-index: 2; }
/* line 155, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 150, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob {
z-index: 2; }
/* line 157, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 152, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob .range-value {
-moz-transition-property: opacity, background-color, border-color, color;
-o-transition-property: opacity, background-color, border-color, color;
@ -3588,27 +3579,27 @@ mct-include.l-time-controller {
height: 20px;
line-height: 20px;
white-space: nowrap; }
/* line 166, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 160, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob:hover .range-value {
color: rgba(0, 153, 204, 0.7); }
/* line 169, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 163, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-l {
margin-left: -10px; }
/* line 172, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 165, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-l .range-value {
text-align: right;
right: 10px; }
/* line 177, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 170, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-r {
margin-right: -10px; }
/* line 180, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 172, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-r .range-value {
left: 10px; }
/* line 3, ../../../../general/res/sass/controls/_time-controller.scss */
mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:before, mct-include.l-time-controller .knob.knob-r:hover + .range-holder .range .toi-line:after {
background-color: #0052b5; }
/* line 194, ../../../../general/res/sass/controls/_time-controller.scss */
/* line 182, ../../../../general/res/sass/controls/_time-controller.scss */
.s-time-range-val {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@ -3772,7 +3763,7 @@ mct-include.l-time-controller {
height: 150px; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
.form .form-row .selector-list.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/* line 124, ../../../../general/res/sass/forms/_elems.scss */
.form .form-row .selector-list > .wrapper {
overflow: auto;
@ -3826,15 +3817,39 @@ input[type="text"] {
border: none;
color: #666;
outline: none;
padding: 0 3px; }
padding: 0 3px;
vertical-align: baseline;
padding: 3px 5px; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
input[type="text"].error {
background: rgba(255, 0, 0, 0.5); }
/* line 172, ../../../../general/res/sass/forms/_elems.scss */
background: rgba(255, 0, 0, 0.5) !important; }
/* line 169, ../../../../general/res/sass/forms/_elems.scss */
input[type="text"].numeric {
text-align: right; }
/* line 177, ../../../../general/res/sass/forms/_elems.scss */
/* line 174, ../../../../general/res/sass/forms/_elems.scss */
.complex-input {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
-moz-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px;
-webkit-box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px;
box-shadow: inset rgba(0, 0, 0, 0.4) 0 1px 3px;
background: #fff;
display: inline-block;
padding: 3px 5px 3px 3px; }
/* line 183, ../../../../general/res/sass/forms/_elems.scss */
.complex-input input[type="text"] {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
background: none;
padding: 1px 3px; }
/* line 191, ../../../../general/res/sass/forms/_elems.scss */
textarea {
-moz-appearance: none;
-webkit-appearance: none;
@ -3857,7 +3872,7 @@ textarea {
width: 100%; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
textarea.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
@ -3988,7 +4003,7 @@ textarea {
padding: 5px; }
/* line 327, ../../../../general/res/sass/_mixins.scss */
.channel-selector .treeview.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/* line 36, ../../../../general/res/sass/forms/_channel-selector.scss */
.channel-selector .btns-add-remove {
margin-top: 150px; }
@ -4157,7 +4172,7 @@ span.req {
.filter input.t-filter-input.error,
.t-filter input.filter.error,
.t-filter input.t-filter-input.error {
background: rgba(255, 0, 0, 0.5); }
background: rgba(255, 0, 0, 0.5) !important; }
/* line 28, ../../../../general/res/sass/forms/_filter.scss */
.filter input.t-filter-input,
.t-filter input.t-filter-input {

View File

@ -6,6 +6,6 @@
ng-model='ngModel'
field="'domain'"
options="ngModel.options"
style="position: absolute; right: 0px; bottom: 46px;"
style="position: absolute; right: 0px; top: 5px;"
>
</mct-control>

View File

@ -23,7 +23,7 @@
<div class="w2"
ng-controller="ScrollingListController">
<!-- To add filtering, add class 'filterable' to <table> and uncomment 2nd <tr> in <thead> -->
<table class="tabular fixed-header">
<table class="tabular">
<thead>
<tr>
<th ng-repeat="header in headers">