From 883d1feb32dbc86f3fa4f7724f4ced9670e7b8ad Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 20 Sep 2017 10:36:56 -0700
Subject: [PATCH] [Frontend] Styling and content on Follow indicator

Fixes #1688
---
 platform/commonUI/general/res/sass/_status.scss            | 1 -
 platform/commonUI/general/res/sass/controls/_messages.scss | 4 ++++
 platform/features/clock/src/indicators/FollowIndicator.js  | 7 +++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/commonUI/general/res/sass/_status.scss b/platform/commonUI/general/res/sass/_status.scss
index a07e9a3247..428ee37016 100644
--- a/platform/commonUI/general/res/sass/_status.scss
+++ b/platform/commonUI/general/res/sass/_status.scss
@@ -50,7 +50,6 @@
         content:'';
         font-family: symbolsfont;
         font-size: 0.8em;
-        display: inline;
         margin-right: $interiorMarginSm;
     }
 }
diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss
index fcc0df7665..f637f1e4ed 100644
--- a/platform/commonUI/general/res/sass/controls/_messages.scss
+++ b/platform/commonUI/general/res/sass/controls/_messages.scss
@@ -120,7 +120,11 @@
 	}
 
 	.status-indicator {
+        background: none !important;
 		margin-right: $interiorMarginSm;
+        &[class*='s-status']:before {
+            font-size: 1em;
+        }
 	}
 
 	.count {
diff --git a/platform/features/clock/src/indicators/FollowIndicator.js b/platform/features/clock/src/indicators/FollowIndicator.js
index 7574cb4201..1c1aabea3f 100644
--- a/platform/features/clock/src/indicators/FollowIndicator.js
+++ b/platform/features/clock/src/indicators/FollowIndicator.js
@@ -23,7 +23,7 @@
 define(
     ['moment'],
     function (moment) {
-        var NO_TIMER = "No timer being followed.";
+        var NO_TIMER = "No timer being followed";
 
         /**
          * Indicator that displays the active timer, as well as its
@@ -40,12 +40,11 @@ define(
         };
 
         FollowIndicator.prototype.getCssClass = function () {
-            return "icon-clock";
+            return (this.timerService.getTimer()) ? "icon-timer s-status-ok" : "icon-timer";
         };
 
         FollowIndicator.prototype.getText = function () {
-            var timer = this.timerService.getTimer();
-            return timer ? timer.getModel().name : NO_TIMER;
+            return (this.timerService.getTimer()) ? 'Following timer ' + timer.getModel().name : NO_TIMER;
         };
 
         FollowIndicator.prototype.getDescription = function () {