From: etimberg <evert.timberg@gmail.com>
Date: Sun, 18 Oct 2015 22:17:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
X-Git-Tag: 2.0.0-beta~4^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b057cf690c692a82ce208202eb45f5161668f05;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
---

2b057cf690c692a82ce208202eb45f5161668f05
diff --cc src/core/core.scale.js
index c9f842339,23b5a9b70..e768726ce
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@@ -503,10 -503,10 +512,10 @@@
  								}
  							}
  
 -							
 +
  							this.ctx.translate(xLabelValue, yLabelValue);
  							this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
- 							this.ctx.font = this.font;
+ 							this.ctx.font = labelFont;
  							this.ctx.textBaseline = "middle";
  							this.ctx.fillText(label, 0, 0);
  							this.ctx.restore();