From 2a569a3b42465cfb51ae5073d6885ed758072ecf Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 28 Mar 2018 15:24:21 +0100
Subject: No longer horizontally align label with JS.

Fixes positioning bugs in all versions of IE due
to calculating the wrong horizontal position.
---
 web/cobrands/sass/_dashboard.scss | 4 +++-
 web/js/dashboard.js               | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/cobrands/sass/_dashboard.scss b/web/cobrands/sass/_dashboard.scss
index 0fbff88e9..6867e0be4 100644
--- a/web/cobrands/sass/_dashboard.scss
+++ b/web/cobrands/sass/_dashboard.scss
@@ -98,6 +98,8 @@
         position: absolute;
         margin-top: -1em;
         margin-#{$right}: 0;
+        right: 0;
+        width: 18%; // 20% padding from .labelled-line-chart, 2% gutter
     }
 }
 
@@ -348,4 +350,4 @@
             margin-#{$right}: 1.5em !important;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/web/js/dashboard.js b/web/js/dashboard.js
index 1f7f7c3e5..82b5e6188 100644
--- a/web/js/dashboard.js
+++ b/web/js/dashboard.js
@@ -27,7 +27,6 @@ $(function(){
 
     var setUpLabelsForChart = function(chart){
         var $parent = $(chart.chart.canvas).parent();
-        var xGutterInPixels = 30;
 
         var lasty = 0;
         $.each(chart.config.data.datasets, function(datasetIndex, dataset){
@@ -38,8 +37,7 @@ $(function(){
                 y = lasty;
             }
             $label.css({
-                top: y,
-                left: latestPoint._model.x + xGutterInPixels
+                top: y
             });
             lasty = y + $label.height() + 8;
         });
-- 
cgit v1.2.3