From bf0e85a94cffb3e104457ca6a73d549cefd6f131 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon, 11 Jul 2016 11:35:26 -0700
Subject: [PATCH] [Frontend] Styling for Time Conductor v2

Fixes #933
Renamed main class; removed unused <style>
defs
---
 platform/commonUI/general/res/sass/_main.scss |  2 +-
 ...e-controller.scss => _time-conductor.scss} |  0
 .../res/templates/time-conductor.html         | 28 -------------------
 3 files changed, 1 insertion(+), 29 deletions(-)
 rename platform/commonUI/general/res/sass/controls/{_time-controller.scss => _time-conductor.scss} (100%)

diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss
index bc20fe9e1ce..99595535f28 100644
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -40,7 +40,7 @@
 @import "controls/lists";
 @import "controls/menus";
 @import "controls/messages";
-@import "controls/time-controller";
+@import "controls/time-conductor";
 @import "mobile/controls/menus";
 
 /********************************* FORMS */
diff --git a/platform/commonUI/general/res/sass/controls/_time-controller.scss b/platform/commonUI/general/res/sass/controls/_time-conductor.scss
similarity index 100%
rename from platform/commonUI/general/res/sass/controls/_time-controller.scss
rename to platform/commonUI/general/res/sass/controls/_time-conductor.scss
diff --git a/platform/features/conductor-v2/res/templates/time-conductor.html b/platform/features/conductor-v2/res/templates/time-conductor.html
index aad1889fb32..a91fe47473a 100644
--- a/platform/features/conductor-v2/res/templates/time-conductor.html
+++ b/platform/features/conductor-v2/res/templates/time-conductor.html
@@ -1,31 +1,3 @@
-<style>
-    .time-system .menu{
-        bottom: 10px;
-    }
-    .l-data-availability {
-        width: 100%;
-        height: 20px;
-        background-color: #3b3b3b
-    }
-
-    .l-time-range-inputs-elem {
-        width: 100%;
-    }
-
-    .l-time-range-inputs-elem.l-flex-row {
-        justify-content: space-between;
-    }
-    .l-axis-holder {
-        height: 30px;
-        width: 100%;
-    }
-
-    .l-axis-holder svg, .l-axis-holder svg path,
-    .l-axis-holder svg line  {
-        stroke: #A0A0A0;
-    }
-
-</style>
 <!-- Parent holder for time conductor. follow-mode | fixed-mode -->
 <div ng-controller="TimeConductorController as tcController"
      class="l-time-conductor l-flex-col {{modeModel.selected}}-mode">