Skip to content

Commit

Permalink
[Frontend] Renew support for Time Conductor v1
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
charlesh88 committed Jul 20, 2016
1 parent 15a608a commit f641edb
Show file tree
Hide file tree
Showing 7 changed files with 347 additions and 8 deletions.
1 change: 0 additions & 1 deletion platform/commonUI/general/res/sass/_constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ $uePaneMiniTabW: 10px;
$uePaneMiniTabCollapsedW: 11px;
$ueEditLeftPaneW: 75%;
$treeSearchInputBarH: 25px;
$ueTimeControlH: (25px, 6px, 20px);
/*************** Panes */
$ueBrowseLeftPaneTreeMinW: 150px;
$ueBrowseLeftPaneTreeMaxW: 35%;
Expand Down
1 change: 0 additions & 1 deletion platform/commonUI/general/res/sass/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
@import "controls/lists";
@import "controls/menus";
@import "controls/messages";
@import "controls/time-conductor";
@import "mobile/controls/menus";

/********************************* FORMS */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
at runtime from the About dialog for additional information.
-->
<div ng-controller="TimeRangeController as trCtrl" class="l-flex-col">
<form class="l-time-conductor-inputs-holder l-flex-row flex-elem"
<form class="l-time-range-inputs-holder l-flex-row flex-elem"
ng-submit="trCtrl.updateBoundsFromForm()">
<span class="l-time-range-inputs-elem ui-symbol type-icon flex-elem">&#x43;</span>
<span class="l-time-range-inputs-elem l-flex-row flex-elem">
Expand Down Expand Up @@ -86,7 +86,7 @@
</div>
</div>

<div class="l-time-conductor-ticks flex-elem">
<div class="l-time-range-ticks-holder flex-elem">
<div class="l-time-range-ticks">
<div
ng-repeat="tick in ticks track by $index"
Expand Down
5 changes: 5 additions & 0 deletions platform/features/conductor-v2/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ define([
]
}
],
"stylesheets": [
{
"stylesheetUrl": "css/time-conductor.css"
}
],
"representations": [
{
"key": "time-conductor",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
/*****************************************************************************
* 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 "bourbon";

@import "../../../../commonUI/general/res/sass/constants";
@import "../../../../commonUI/general/res/sass/mixins";
@import "../../../../commonUI/general/res/sass/mobile/constants";
@import "../../../../commonUI/general/res/sass/mobile/mixins";
@import "../../../../commonUI/themes/espresso/res/sass/constants";
@import "../../../../commonUI/themes/espresso/res/sass/mixins";
@import "../../../../commonUI/general/res/sass/icons";

$ueTimeConductorH: (25px, 6px, 20px);

@mixin toiLineHovEffects() {
&:before,
&:after {
Expand All @@ -20,7 +53,7 @@
height: $d !important;
width: $d;
position: relative;

// Icon shape: brackets
&:before,
&:after {
Expand Down Expand Up @@ -87,9 +120,9 @@
$knobHOffset: 0px;
$rangeValPad: $interiorMargin;
$rangeValOffset: $sliderKnobW + $interiorMargin;
$r1H: nth($ueTimeControlH, 1);
$r2H: nth($ueTimeControlH, 2);
$r3H: nth($ueTimeControlH, 3);
$r1H: nth($ueTimeConductorH, 1);
$r2H: nth($ueTimeConductorH, 2);
$r3H: nth($ueTimeConductorH, 3);

// Glyphs Todo: replace with refactored CSS approach when that is merged into master
$glyphIconFixed: '\e604';
Expand Down
5 changes: 5 additions & 0 deletions platform/features/conductor/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ define([
]
}
],
"stylesheets": [
{
"stylesheetUrl": "css/time-conductor.css"
}
],
"components": [
{
"type": "decorator",
Expand Down
Loading

0 comments on commit f641edb

Please sign in to comment.