From ce5d0ef5bdc59c32d49521f428394d909f28712a Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Mon, 1 Aug 2016 16:03:27 -0700
Subject: [PATCH] Merged stylesheet changes

---
 main.js                                            |  6 +++---
 .../res/sass/time-conductor-espresso.scss          | 14 +++++++-------
 .../conductor/res/sass/time-conductor-snow.scss    | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/main.js b/main.js
index 2241b3c3fde..0c1d93f0a68 100644
--- a/main.js
+++ b/main.js
@@ -104,9 +104,9 @@ define([
     './platform/entanglement/bundle',
     './platform/search/bundle',
     './platform/status/bundle',
-    './platform/commonUI/regions/bundle',
-    './example/msl/bundle',
-    './example/localTimeSystem/bundle'
+    './platform/commonUI/regions/bundle'
+    //'./examples/localTimeSystem/bundle'
+    //'./example/msl/bundle'
 ], function (Main, legacyRegistry) {
     return {
         legacyRegistry: legacyRegistry,
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
index d9562e762ea..6e61b1cea69 100644
--- a/platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss
+++ b/platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss
@@ -20,13 +20,13 @@
  * 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 "../../../../../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
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
index 2d55f2b0026..8ea50baa47d 100644
--- a/platform/features/conductor-v2/conductor/res/sass/time-conductor-snow.scss
+++ b/platform/features/conductor-v2/conductor/res/sass/time-conductor-snow.scss
@@ -20,13 +20,13 @@
  * 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 "../../../../../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