ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-21 16:49:42 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Frontend] Layout and positioning fixes for TC controls

Browse Source 
open #889
This commit is contained in:
Charles Hacskaylo
2016-05-09 10:38:18 -07:00
parent cae85f3e30
commit 2e8604e18d
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/commonUI/general/res/sass/controls/_time-controller.scss
View File

@ -38,8 +38,15 @@
.l-time-range-inputs-holder { .l-time-range-inputs-holder {
height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2); height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
padding-top: $interiorMargin; //padding-top: $interiorMargin;
border-top: 1px solid $colorInteriorBorder; border-top: 1px solid $colorInteriorBorder;
&.l-flex-row {
@include align-items(center);
.flex-elem {
height: auto;
line-height: normal;
}
}
.type-icon { .type-icon {
font-size: 120%; font-size: 120%;
vertical-align: middle; vertical-align: middle;
@ -141,7 +148,6 @@
z-index: 2; z-index: 2;
.range-value { .range-value {
@include trans-prop-nice-fade(.25s); @include trans-prop-nice-fade(.25s);
//background: rgba(red, 0.4);
font-size: 0.7rem; font-size: 0.7rem;
padding: 0 $rangeValOffset; padding: 0 $rangeValOffset;
position: absolute; position: absolute;
@ -175,7 +181,7 @@
.l-time-domain-selector { .l-time-domain-selector {
position: absolute; position: absolute;
right: 0px; right: 0px;
bottom: 46px; bottom: 43px;
} }
} }

10
platform/commonUI/general/res/templates/controls/time-controller.html
View File

@ -20,10 +20,10 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div ng-controller="TimeRangeController as trCtrl"> <div ng-controller="TimeRangeController as trCtrl">
<form class="l-time-range-inputs-holder" <form class="l-time-range-inputs-holder l-flex-row"
ng-submit="trCtrl.updateBoundsFromForm()"> ng-submit="trCtrl.updateBoundsFromForm()">
<span class="l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span> <span class="l-time-range-inputs-elem ui-symbol type-icon flex-elem">&#x43;</span>
<span class="l-time-range-input"> <span class="l-time-range-input flex-elem">
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ structure="{
format: parameters.format, format: parameters.format,
@ -36,9 +36,9 @@
</mct-control> </mct-control>
</span> </span>
<span class="l-time-range-inputs-elem lbl">to</span> <span class="l-time-range-inputs-elem lbl flex-elem">to</span>
<span class="l-time-range-input" ng-controller="ToggleController as t2"> <span class="l-time-range-input flex-elem" ng-controller="ToggleController as t2">
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ structure="{
format: parameters.format, format: parameters.format,