Remove size, style and family from the return value of parseFontOptions

chartjs · Mar 5, 2019 · 8925eed · 8925eed
1 parent c8a7774
commit 8925eed
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -162,9 +162,6 @@ function parseFontOptions(options, nestedOpts) {
 	var family = resolve([nestedOpts.fontFamily, options.fontFamily, globalDefaults.defaultFontFamily]);
 
 	return {
-		size: size,
-		style: style,
-		family: family,
 		string: helpers.fontString(size, style, family),
 		lineHeight: helpers.options.toLineHeight(resolve([nestedOpts.lineHeight, options.lineHeight, globalDefaults.defaultLineHeight]), size),
 		color: resolve([nestedOpts.fontColor, options.fontColor, globalDefaults.defaultFontColor])
@@ -507,7 +504,7 @@ module.exports = Element.extend({
 			var lastLabelSize = labelSizes.last;
 			var widestLabelSize = labelSizes.widest;
 			var highestLabelSize = labelSizes.highest;
-			var lineSpace = tickFonts.minor.size * 0.5;
+			var lineSpace = tickFonts.minor.lineHeight * 0.4;
 			var tickPadding = tickOpts.padding;
 
 			if (isHorizontal) {