diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | web/js/dashboard.js | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a0a19e5..45f6e3269 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Bugfixes: - Stop asset layers obscuring marker layer. #1999 - Don't delete hidden field values when inspecting reports. #1999 + - Fix text layout issues in /reports/…/summary dashboard charts. - Admin improvements: - Inspectors can set non_public status of reports. #1992 diff --git a/web/js/dashboard.js b/web/js/dashboard.js index 0eb53f964..23c5496e6 100644 --- a/web/js/dashboard.js +++ b/web/js/dashboard.js @@ -226,7 +226,6 @@ $(function(){ ctx = chartInstance.ctx; ctx.font = Chart.helpers.fontString( Chart.defaults.global.defaultFontSize * 0.8, 'bold', Chart.defaults.global.defaultFontFamily); - ctx.textAlign = 'right'; ctx.textBaseline = 'middle'; this.data.datasets.forEach(function (dataset, i) { @@ -238,10 +237,12 @@ $(function(){ var gutter = (bar._model.height - (Chart.defaults.global.defaultFontSize * 0.8)) / 2; var textX; if (width_text + 2 * gutter > width_bar) { - textX = bar._model.x + 2 * gutter; + textX = bar._model.x + gutter; + ctx.textAlign = 'left'; ctx.fillStyle = bar._model.backgroundColor; } else { textX = bar._model.x - gutter; + ctx.textAlign = 'right'; ctx.fillStyle = '#fff'; } ctx.fillText( dataValue, textX, bar._model.y ); |