Added LocalTimeSystem and merged latest styles

example/localTimeSystem/src/LocalTimeSystem.js

@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 define([
-    '../../../platform/features/conductor/src/timeSystems/TimeSystem',
-    '../../platform/features/conductor/src/timeSystems/LocalClock'
+    '../../../platform/features/conductor-v2/conductor/src/timeSystems/TimeSystem',
+    '../../../platform/features/conductor-v2/conductor/src/timeSystems/LocalClock'
 ], function (TimeSystem, LocalClock) {
     var FIFTEEN_MINUTES = 15 * 60 * 1000,
         DEFAULT_PERIOD = 1000;

platform/commonUI/themes/espresso/res/sass/_constants.scss

@@ -208,9 +208,3 @@ $colorAboutLink: #84b3ff;
 // Loading
 $colorLoadingFg: $colorAlt1;
 $colorLoadingBg: rgba($colorBodyFg, 0.2);
-
-// Time Conductor
-$colorTimeCondKeyBg: #4e70dc;
-$colorTimeCondKeyFg: #fff;
-$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);
-$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 10%);

platform/commonUI/themes/snow/res/sass/_constants.scss

@@ -208,9 +208,3 @@ $colorAboutLink: #84b3ff;
 // Loading
 $colorLoadingFg: $colorAlt1;
 $colorLoadingBg: rgba($colorLoadingFg, 0.1);
-
-// Time Conductor
-$colorTimeCondKeyBg: #6178dc;
-$colorTimeCondKeyFg: #fff;
-$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);
-$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%);

platform/features/conductor-v2/conductor/bundle.js

@@ -69,7 +69,12 @@ define([
             ],
             "stylesheets": [
                 {
-                    "stylesheetUrl": "css/time-conductor.css"
+                    "stylesheetUrl": "css/time-conductor-espresso.css",
+                    "theme": "espresso"
+                },
+                {
+                    "stylesheetUrl": "css/time-conductor-snow.css",
+                    "theme": "snow"
                 }
             ],
             "representations": [

platform/features/conductor-v2/conductor/res/sass/time-conductor.scss → platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss

@@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * Open MCT, 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
+ * Open MCT 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.
@@ -14,21 +14,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  *
- * Open MCT Web includes source code licensed under additional open source
+ * Open MCT 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";
-@import "constants";
-
 @mixin toiLineHovEffects() {
     &:before,
     &:after {

platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT 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 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";
+@import "constants";
+
+// Thematic constants
+$colorTimeCondKeyBg: #4e70dc;
+$colorTimeCondKeyFg: #fff;
+$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);
+$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 10%);
+@import "time-conductor-base";

platform/features/conductor-v2/conductor/res/sass/time-conductor-snow.scss

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT 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 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/snow/res/sass/constants";
+@import "../../../../commonUI/themes/snow/res/sass/mixins";
+@import "../../../../commonUI/general/res/sass/icons";
+@import "constants";
+
+// Thematic constants
+$colorTimeCondKeyBg: #6178dc;
+$colorTimeCondKeyFg: #fff;
+$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);
+$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%);
+@import "time-conductor-base";