diff --git a/example/localTimeSystem/src/LocalTimeSystem.js b/example/localTimeSystem/src/LocalTimeSystem.js index 376ee8ada3d..4c21e450e87 100644 --- a/example/localTimeSystem/src/LocalTimeSystem.js +++ b/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; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index a0d7adac115..d32db1d6d71 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/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%); \ No newline at end of file diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 70bd3ce2993..87a729d7756 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/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%); diff --git a/platform/features/conductor-v2/conductor/bundle.js b/platform/features/conductor-v2/conductor/bundle.js index 3bd6d2b5f66..03cd12cb5b9 100644 --- a/platform/features/conductor-v2/conductor/bundle.js +++ b/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": [ diff --git a/platform/features/conductor-v2/conductor/res/sass/time-conductor.scss b/platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss similarity index 94% rename from platform/features/conductor-v2/conductor/res/sass/time-conductor.scss rename to platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss index 999c3d9e1c9..f991b48794d 100644 --- a/platform/features/conductor-v2/conductor/res/sass/time-conductor.scss +++ b/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 { diff --git a/platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss b/platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss new file mode 100644 index 00000000000..d9562e762ea --- /dev/null +++ b/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"; \ No newline at end of file diff --git a/platform/features/conductor-v2/conductor/res/sass/time-conductor-snow.scss b/platform/features/conductor-v2/conductor/res/sass/time-conductor-snow.scss new file mode 100644 index 00000000000..2d55f2b0026 --- /dev/null +++ b/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"; \ No newline at end of file