Skip to content

Commit f641edb

Browse files
committed
[Frontend] Renew support for Time Conductor v1
Fixes #933 Time Conductors v1 and v2 now build and load their own isolated CSS files. All previous styling for TCv1 should be re-enabled. Note that Conductor v2 mobile is not complete yet.
1 parent 15a608a commit f641edb

File tree

7 files changed

+347
-8
lines changed

7 files changed

+347
-8
lines changed

platform/commonUI/general/res/sass/_constants.scss

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ $uePaneMiniTabW: 10px;
4848
$uePaneMiniTabCollapsedW: 11px;
4949
$ueEditLeftPaneW: 75%;
5050
$treeSearchInputBarH: 25px;
51-
$ueTimeControlH: (25px, 6px, 20px);
5251
/*************** Panes */
5352
$ueBrowseLeftPaneTreeMinW: 150px;
5453
$ueBrowseLeftPaneTreeMaxW: 35%;

platform/commonUI/general/res/sass/_main.scss

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
@import "controls/lists";
4242
@import "controls/menus";
4343
@import "controls/messages";
44-
@import "controls/time-conductor";
4544
@import "mobile/controls/menus";
4645

4746
/********************************* FORMS */

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
at runtime from the About dialog for additional information.
2121
-->
2222
<div ng-controller="TimeRangeController as trCtrl" class="l-flex-col">
23-
<form class="l-time-conductor-inputs-holder l-flex-row flex-elem"
23+
<form class="l-time-range-inputs-holder l-flex-row flex-elem"
2424
ng-submit="trCtrl.updateBoundsFromForm()">
2525
<span class="l-time-range-inputs-elem ui-symbol type-icon flex-elem">&#x43;</span>
2626
<span class="l-time-range-inputs-elem l-flex-row flex-elem">
@@ -86,7 +86,7 @@
8686
</div>
8787
</div>
8888

89-
<div class="l-time-conductor-ticks flex-elem">
89+
<div class="l-time-range-ticks-holder flex-elem">
9090
<div class="l-time-range-ticks">
9191
<div
9292
ng-repeat="tick in ticks track by $index"

platform/features/conductor-v2/bundle.js

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ define([
6868
]
6969
}
7070
],
71+
"stylesheets": [
72+
{
73+
"stylesheetUrl": "css/time-conductor.css"
74+
}
75+
],
7176
"representations": [
7277
{
7378
"key": "time-conductor",

platform/commonUI/general/res/sass/controls/_time-conductor.scss platform/features/conductor-v2/res/sass/time-conductor.scss

+37-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
/*****************************************************************************
2+
* Open MCT Web, Copyright (c) 2014-2015, United States Government
3+
* as represented by the Administrator of the National Aeronautics and Space
4+
* Administration. All rights reserved.
5+
*
6+
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
* http://www.apache.org/licenses/LICENSE-2.0.
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations
15+
* under the License.
16+
*
17+
* Open MCT Web includes source code licensed under additional open source
18+
* licenses. See the Open Source Licenses file (LICENSES.md) included with
19+
* this source code distribution or the Licensing information page available
20+
* at runtime from the About dialog for additional information.
21+
*****************************************************************************/
22+
@import "bourbon";
23+
24+
@import "../../../../commonUI/general/res/sass/constants";
25+
@import "../../../../commonUI/general/res/sass/mixins";
26+
@import "../../../../commonUI/general/res/sass/mobile/constants";
27+
@import "../../../../commonUI/general/res/sass/mobile/mixins";
28+
@import "../../../../commonUI/themes/espresso/res/sass/constants";
29+
@import "../../../../commonUI/themes/espresso/res/sass/mixins";
30+
@import "../../../../commonUI/general/res/sass/icons";
31+
32+
$ueTimeConductorH: (25px, 6px, 20px);
33+
134
@mixin toiLineHovEffects() {
235
&:before,
336
&:after {
@@ -20,7 +53,7 @@
2053
height: $d !important;
2154
width: $d;
2255
position: relative;
23-
56+
2457
// Icon shape: brackets
2558
&:before,
2659
&:after {
@@ -87,9 +120,9 @@
87120
$knobHOffset: 0px;
88121
$rangeValPad: $interiorMargin;
89122
$rangeValOffset: $sliderKnobW + $interiorMargin;
90-
$r1H: nth($ueTimeControlH, 1);
91-
$r2H: nth($ueTimeControlH, 2);
92-
$r3H: nth($ueTimeControlH, 3);
123+
$r1H: nth($ueTimeConductorH, 1);
124+
$r2H: nth($ueTimeConductorH, 2);
125+
$r3H: nth($ueTimeConductorH, 3);
93126

94127
// Glyphs Todo: replace with refactored CSS approach when that is merged into master
95128
$glyphIconFixed: '\e604';

platform/features/conductor/bundle.js

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ define([
4747
]
4848
}
4949
],
50+
"stylesheets": [
51+
{
52+
"stylesheetUrl": "css/time-conductor.css"
53+
}
54+
],
5055
"components": [
5156
{
5257
"type": "decorator",

0 commit comments

Comments
 (0)