diff --git a/src/components/colorbar/defaults.js b/src/components/colorbar/defaults.js index 0747e0e186e..666fcfe7ca1 100644 --- a/src/components/colorbar/defaults.js +++ b/src/components/colorbar/defaults.js @@ -48,7 +48,8 @@ module.exports = function colorbarDefaults(containerIn, containerOut, layout) { handleTickValueDefaults(colorbarIn, colorbarOut, coerce, 'linear'); - var opts = {outerTicks: false, font: layout.font}; + var font = layout.font; + var opts = {outerTicks: false, font: font}; if(ticklabelposition.indexOf('inside') !== -1) { opts.bgColor = 'black'; // could we instead use the average of colors in the scale? } @@ -56,6 +57,12 @@ module.exports = function colorbarDefaults(containerIn, containerOut, layout) { handleTickMarkDefaults(colorbarIn, colorbarOut, coerce, 'linear', opts); coerce('title.text', layout._dfltTitle.colorbar); - Lib.coerceFont(coerce, 'title.font', layout.font); + + var tickFont = colorbarOut.tickfont; + var dfltTitleFont = Lib.extendFlat({}, tickFont, { + color: font.color, + size: Lib.bigFont(tickFont.size) + }); + Lib.coerceFont(coerce, 'title.font', dfltTitleFont); coerce('title.side'); }; diff --git a/src/components/legend/attributes.js b/src/components/legend/attributes.js index 7179f99bcce..28a3d00fd25 100644 --- a/src/components/legend/attributes.js +++ b/src/components/legend/attributes.js @@ -189,7 +189,8 @@ module.exports = { font: fontAttrs({ editType: 'legend', description: [ - 'Sets this legend\'s title font.' + 'Sets this legend\'s title font.', + 'Defaults to `legend.font` with its size increased about 20%.' ].join(' '), }), side: { diff --git a/src/components/legend/defaults.js b/src/components/legend/defaults.js index f1e434d8b6f..e74575f45de 100644 --- a/src/components/legend/defaults.js +++ b/src/components/legend/defaults.js @@ -77,12 +77,13 @@ module.exports = function legendDefaults(layoutIn, layoutOut, fullData) { coerce('bgcolor', layoutOut.paper_bgcolor); coerce('bordercolor'); coerce('borderwidth'); - Lib.coerceFont(coerce, 'font', layoutOut.font); + var itemFont = Lib.coerceFont(coerce, 'font', layoutOut.font); var orientation = coerce('orientation'); + var isHorizontal = orientation === 'h'; var defaultX, defaultY, defaultYAnchor; - if(orientation === 'h') { + if(isHorizontal) { defaultX = 0; if(Registry.getComponentMethod('rangeslider', 'isVisible')(layoutIn.xaxis)) { @@ -119,7 +120,11 @@ module.exports = function legendDefaults(layoutIn, layoutOut, fullData) { var titleText = coerce('title.text'); if(titleText) { - coerce('title.side', orientation === 'h' ? 'left' : 'top'); - Lib.coerceFont(coerce, 'title.font', layoutOut.font); + coerce('title.side', isHorizontal ? 'left' : 'top'); + var dfltTitleFont = Lib.extendFlat({}, itemFont, { + size: Lib.bigFont(itemFont.size) + }); + + Lib.coerceFont(coerce, 'title.font', dfltTitleFont); } }; diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js index d5b614a3506..6b6e783a68b 100644 --- a/src/components/legend/draw.js +++ b/src/components/legend/draw.js @@ -539,6 +539,11 @@ function computeTextDimensions(g, gd, legendObj, aTitle) { // approximation to height offset to center the font // to avoid getBoundingClientRect if(aTitle === MAIN_TITLE) { + if(legendObj.title.side === 'left') { + // add extra space between legend title and itmes + width += constants.itemGap * 2; + } + svgTextUtils.positionText(textEl, bw + constants.titlePad, bw + lineHeight diff --git a/src/lib/index.js b/src/lib/index.js index 685adcb962b..ab21d11cad1 100644 --- a/src/lib/index.js +++ b/src/lib/index.js @@ -1263,3 +1263,7 @@ lib.join2 = function(arr, mainSeparator, lastSeparator) { } return arr.join(mainSeparator); }; + +lib.bigFont = function(size) { + return Math.round(1.2 * size); +}; diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js index 93875a6c22e..3e3185bfe04 100644 --- a/src/plots/cartesian/axes.js +++ b/src/plots/cartesian/axes.js @@ -554,7 +554,7 @@ axes.prepTicks = function(ax, opts) { if(!nt) { if(ax.type === 'category' || ax.type === 'multicategory') { - minPx = ax.tickfont ? (ax.tickfont.size || 12) * 1.2 : 15; + minPx = ax.tickfont ? Lib.bigFont(ax.tickfont.size || 12) : 15; nt = ax._length / minPx; } else { minPx = ax._id.charAt(0) === 'y' ? 40 : 80; diff --git a/src/plots/cartesian/axis_defaults.js b/src/plots/cartesian/axis_defaults.js index c68adbca305..2b67a5162cf 100644 --- a/src/plots/cartesian/axis_defaults.js +++ b/src/plots/cartesian/axis_defaults.js @@ -116,7 +116,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce, coerce('title.text', dfltTitle); Lib.coerceFont(coerce, 'title.font', { family: font.family, - size: Math.round(font.size * 1.2), + size: Lib.bigFont(font.size), color: dfltFontColor }); diff --git a/src/plots/polar/layout_defaults.js b/src/plots/polar/layout_defaults.js index 6f29c768b56..a3ad091932e 100644 --- a/src/plots/polar/layout_defaults.js +++ b/src/plots/polar/layout_defaults.js @@ -98,7 +98,7 @@ function handleDefaults(contIn, contOut, coerce, opts) { coerceAxis('title.text'); Lib.coerceFont(coerceAxis, 'title.font', { family: opts.font.family, - size: Math.round(opts.font.size * 1.2), + size: Lib.bigFont(opts.font.size), color: dfltFontColor }); } diff --git a/src/plots/ternary/layout_defaults.js b/src/plots/ternary/layout_defaults.js index 31ad2f873a0..0223bc79be9 100644 --- a/src/plots/ternary/layout_defaults.js +++ b/src/plots/ternary/layout_defaults.js @@ -82,7 +82,7 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut Lib.coerceFont(coerce, 'title.font', { family: options.font.family, - size: Math.round(options.font.size * 1.2), + size: Lib.bigFont(options.font.size), color: dfltFontColor }); diff --git a/src/traces/carpet/axis_defaults.js b/src/traces/carpet/axis_defaults.js index e5dd2259a58..3572d9a5f8d 100644 --- a/src/traces/carpet/axis_defaults.js +++ b/src/traces/carpet/axis_defaults.js @@ -110,7 +110,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options) if(title) { Lib.coerceFont(coerce, 'title.font', { family: font.family, - size: Math.round(font.size * 1.2), + size: Lib.bigFont(font.size), color: dfltFontColor }); coerce('title.offset'); diff --git a/test/image/baselines/airfoil.png b/test/image/baselines/airfoil.png index 0e15244a66d..4bdd829a5ec 100644 Binary files a/test/image/baselines/airfoil.png and b/test/image/baselines/airfoil.png differ diff --git a/test/image/baselines/bar-like_textangle45.png b/test/image/baselines/bar-like_textangle45.png index 57303f2fc17..ab30e8a7b66 100644 Binary files a/test/image/baselines/bar-like_textangle45.png and b/test/image/baselines/bar-like_textangle45.png differ diff --git a/test/image/baselines/bar-like_textangle60.png b/test/image/baselines/bar-like_textangle60.png index 8e00cbd63ae..5e8f64b0237 100644 Binary files a/test/image/baselines/bar-like_textangle60.png and b/test/image/baselines/bar-like_textangle60.png differ diff --git a/test/image/baselines/bar-marker-line-colorscales.png b/test/image/baselines/bar-marker-line-colorscales.png index 983601da6f2..02b158fefef 100644 Binary files a/test/image/baselines/bar-marker-line-colorscales.png and b/test/image/baselines/bar-marker-line-colorscales.png differ diff --git a/test/image/baselines/cmid-zmid.png b/test/image/baselines/cmid-zmid.png index cb929f0f1e7..1e8122e785e 100644 Binary files a/test/image/baselines/cmid-zmid.png and b/test/image/baselines/cmid-zmid.png differ diff --git a/test/image/baselines/colorscale_constraint.png b/test/image/baselines/colorscale_constraint.png index 63c18c23f96..01de99f5309 100644 Binary files a/test/image/baselines/colorscale_constraint.png and b/test/image/baselines/colorscale_constraint.png differ diff --git a/test/image/baselines/contour-heatmap-coloring-set-contours.png b/test/image/baselines/contour-heatmap-coloring-set-contours.png index 2bce86a4600..87392c7839e 100644 Binary files a/test/image/baselines/contour-heatmap-coloring-set-contours.png and b/test/image/baselines/contour-heatmap-coloring-set-contours.png differ diff --git a/test/image/baselines/contour_heatmap_coloring_reversescale.png b/test/image/baselines/contour_heatmap_coloring_reversescale.png index c6d5794d2cf..ed15c6afc53 100644 Binary files a/test/image/baselines/contour_heatmap_coloring_reversescale.png and b/test/image/baselines/contour_heatmap_coloring_reversescale.png differ diff --git a/test/image/baselines/geo_choropleth-legend.png b/test/image/baselines/geo_choropleth-legend.png index 421fb0fcb3c..56bd2d69535 100644 Binary files a/test/image/baselines/geo_choropleth-legend.png and b/test/image/baselines/geo_choropleth-legend.png differ diff --git a/test/image/baselines/geo_choropleth-usa.png b/test/image/baselines/geo_choropleth-usa.png index c16bfe34426..fbfb977220a 100644 Binary files a/test/image/baselines/geo_choropleth-usa.png and b/test/image/baselines/geo_choropleth-usa.png differ diff --git a/test/image/baselines/geo_choropleth-usa_legend.png b/test/image/baselines/geo_choropleth-usa_legend.png index 86ff75d9a73..b4002ff7f3b 100644 Binary files a/test/image/baselines/geo_choropleth-usa_legend.png and b/test/image/baselines/geo_choropleth-usa_legend.png differ diff --git a/test/image/baselines/geo_europe-bubbles.png b/test/image/baselines/geo_europe-bubbles.png index f9147c54f19..98bd5677398 100644 Binary files a/test/image/baselines/geo_europe-bubbles.png and b/test/image/baselines/geo_europe-bubbles.png differ diff --git a/test/image/baselines/gl2d_marker_coloraxis.png b/test/image/baselines/gl2d_marker_coloraxis.png index 4724448d777..8a6559929cb 100644 Binary files a/test/image/baselines/gl2d_marker_coloraxis.png and b/test/image/baselines/gl2d_marker_coloraxis.png differ diff --git a/test/image/baselines/gl2d_parcoords_coloraxis.png b/test/image/baselines/gl2d_parcoords_coloraxis.png index 0e199bc39b1..312b48f8e33 100644 Binary files a/test/image/baselines/gl2d_parcoords_coloraxis.png and b/test/image/baselines/gl2d_parcoords_coloraxis.png differ diff --git a/test/image/baselines/gl2d_scatter-colorscale-colorbar.png b/test/image/baselines/gl2d_scatter-colorscale-colorbar.png index 999a5bf0848..9b2e7d15a55 100644 Binary files a/test/image/baselines/gl2d_scatter-colorscale-colorbar.png and b/test/image/baselines/gl2d_scatter-colorscale-colorbar.png differ diff --git a/test/image/baselines/gl3d_mesh3d_coloring.png b/test/image/baselines/gl3d_mesh3d_coloring.png index 9249a3800bc..2488f365a66 100644 Binary files a/test/image/baselines/gl3d_mesh3d_coloring.png and b/test/image/baselines/gl3d_mesh3d_coloring.png differ diff --git a/test/image/baselines/gl3d_reversescale.png b/test/image/baselines/gl3d_reversescale.png index ae8809b2a4a..c90efd58584 100644 Binary files a/test/image/baselines/gl3d_reversescale.png and b/test/image/baselines/gl3d_reversescale.png differ diff --git a/test/image/baselines/gl3d_scatter3d-colorscale-marker-and-line.png b/test/image/baselines/gl3d_scatter3d-colorscale-marker-and-line.png index 91b4fe027c2..6717340a0bb 100644 Binary files a/test/image/baselines/gl3d_scatter3d-colorscale-marker-and-line.png and b/test/image/baselines/gl3d_scatter3d-colorscale-marker-and-line.png differ diff --git a/test/image/baselines/gl3d_scatter3d-colorscale.png b/test/image/baselines/gl3d_scatter3d-colorscale.png index de456f47ec1..f507e15be06 100644 Binary files a/test/image/baselines/gl3d_scatter3d-colorscale.png and b/test/image/baselines/gl3d_scatter3d-colorscale.png differ diff --git a/test/image/baselines/gl3d_surface_contour_start-end-size.png b/test/image/baselines/gl3d_surface_contour_start-end-size.png index aa153fc3033..d8920774512 100644 Binary files a/test/image/baselines/gl3d_surface_contour_start-end-size.png and b/test/image/baselines/gl3d_surface_contour_start-end-size.png differ diff --git a/test/image/baselines/gl3d_surface_opacityscale_contour.png b/test/image/baselines/gl3d_surface_opacityscale_contour.png index cc01ef66b59..fefc260ae8b 100644 Binary files a/test/image/baselines/gl3d_surface_opacityscale_contour.png and b/test/image/baselines/gl3d_surface_opacityscale_contour.png differ diff --git a/test/image/baselines/gl3d_tetrahedra.png b/test/image/baselines/gl3d_tetrahedra.png index 78650b4d3b5..45b56b8f21a 100644 Binary files a/test/image/baselines/gl3d_tetrahedra.png and b/test/image/baselines/gl3d_tetrahedra.png differ diff --git a/test/image/baselines/gl3d_volume_multiple-traces.png b/test/image/baselines/gl3d_volume_multiple-traces.png index bac50929c50..ebd8f792736 100644 Binary files a/test/image/baselines/gl3d_volume_multiple-traces.png and b/test/image/baselines/gl3d_volume_multiple-traces.png differ diff --git a/test/image/baselines/gl3d_volume_multiple-traces_one-cube.png b/test/image/baselines/gl3d_volume_multiple-traces_one-cube.png index f97aaf4c98b..7683c5b33e8 100644 Binary files a/test/image/baselines/gl3d_volume_multiple-traces_one-cube.png and b/test/image/baselines/gl3d_volume_multiple-traces_one-cube.png differ diff --git a/test/image/baselines/heatmap_legend.png b/test/image/baselines/heatmap_legend.png index 19045a5f1ac..09128e019bd 100644 Binary files a/test/image/baselines/heatmap_legend.png and b/test/image/baselines/heatmap_legend.png differ diff --git a/test/image/baselines/layout_metatext.png b/test/image/baselines/layout_metatext.png index 88358b96a9f..471ac67edae 100644 Binary files a/test/image/baselines/layout_metatext.png and b/test/image/baselines/layout_metatext.png differ diff --git a/test/image/baselines/multicategory_histograms.png b/test/image/baselines/multicategory_histograms.png index 7f8c4ac6f80..8a6b583fc41 100644 Binary files a/test/image/baselines/multicategory_histograms.png and b/test/image/baselines/multicategory_histograms.png differ diff --git a/test/image/baselines/pie_inside-text-orientation.png b/test/image/baselines/pie_inside-text-orientation.png index dc36a274723..f9e49187661 100644 Binary files a/test/image/baselines/pie_inside-text-orientation.png and b/test/image/baselines/pie_inside-text-orientation.png differ diff --git a/test/image/baselines/scatter-colorscale-colorbar.png b/test/image/baselines/scatter-colorscale-colorbar.png index 2ddf0dd7334..c98b104739f 100644 Binary files a/test/image/baselines/scatter-colorscale-colorbar.png and b/test/image/baselines/scatter-colorscale-colorbar.png differ diff --git a/test/image/baselines/sunburst_values_colorscale.png b/test/image/baselines/sunburst_values_colorscale.png index e61bd3e6af7..be7458519c3 100644 Binary files a/test/image/baselines/sunburst_values_colorscale.png and b/test/image/baselines/sunburst_values_colorscale.png differ diff --git a/test/image/baselines/ticklabelposition-4.png b/test/image/baselines/ticklabelposition-4.png index 8605b73289b..7fe0fde2bb3 100644 Binary files a/test/image/baselines/ticklabelposition-4.png and b/test/image/baselines/ticklabelposition-4.png differ diff --git a/test/image/baselines/titles-avoid-labels.png b/test/image/baselines/titles-avoid-labels.png index 35166b37985..df30fb70bdb 100644 Binary files a/test/image/baselines/titles-avoid-labels.png and b/test/image/baselines/titles-avoid-labels.png differ diff --git a/test/image/baselines/trace_metatext.png b/test/image/baselines/trace_metatext.png index c0f3c45443a..8a5c1618534 100644 Binary files a/test/image/baselines/trace_metatext.png and b/test/image/baselines/trace_metatext.png differ diff --git a/test/image/baselines/treemap_values_colorscale.png b/test/image/baselines/treemap_values_colorscale.png index d9e890e853f..94decc69b26 100644 Binary files a/test/image/baselines/treemap_values_colorscale.png and b/test/image/baselines/treemap_values_colorscale.png differ diff --git a/test/image/baselines/uniformtext_bar-like_10_auto.png b/test/image/baselines/uniformtext_bar-like_10_auto.png index 015b335e066..ddc9373f81d 100644 Binary files a/test/image/baselines/uniformtext_bar-like_10_auto.png and b/test/image/baselines/uniformtext_bar-like_10_auto.png differ diff --git a/test/image/baselines/uniformtext_bar-like_8_horizontal.png b/test/image/baselines/uniformtext_bar-like_8_horizontal.png index ea1b416f25d..f5137ec51cf 100644 Binary files a/test/image/baselines/uniformtext_bar-like_8_horizontal.png and b/test/image/baselines/uniformtext_bar-like_8_horizontal.png differ diff --git a/test/image/baselines/uniformtext_bar-like_8_textangle.png b/test/image/baselines/uniformtext_bar-like_8_textangle.png index 01f99d0faa1..d7055045999 100644 Binary files a/test/image/baselines/uniformtext_bar-like_8_textangle.png and b/test/image/baselines/uniformtext_bar-like_8_textangle.png differ diff --git a/test/image/baselines/uniformtext_bar-like_8_textangle45.png b/test/image/baselines/uniformtext_bar-like_8_textangle45.png index 5a669beb90d..ea9fe106d57 100644 Binary files a/test/image/baselines/uniformtext_bar-like_8_textangle45.png and b/test/image/baselines/uniformtext_bar-like_8_textangle45.png differ diff --git a/test/image/baselines/uniformtext_pie_16_auto.png b/test/image/baselines/uniformtext_pie_16_auto.png index 56efde94e13..61a79403a92 100644 Binary files a/test/image/baselines/uniformtext_pie_16_auto.png and b/test/image/baselines/uniformtext_pie_16_auto.png differ diff --git a/test/image/baselines/uniformtext_pie_8_horizontal.png b/test/image/baselines/uniformtext_pie_8_horizontal.png index 9ee4bdb12bb..64161f1c25d 100644 Binary files a/test/image/baselines/uniformtext_pie_8_horizontal.png and b/test/image/baselines/uniformtext_pie_8_horizontal.png differ diff --git a/test/image/baselines/uniformtext_pie_8_horizontal_center.png b/test/image/baselines/uniformtext_pie_8_horizontal_center.png index 1cd2a3b272d..34c13b83022 100644 Binary files a/test/image/baselines/uniformtext_pie_8_horizontal_center.png and b/test/image/baselines/uniformtext_pie_8_horizontal_center.png differ diff --git a/test/image/baselines/uniformtext_pie_8_radial.png b/test/image/baselines/uniformtext_pie_8_radial.png index 545fe12a54b..133e9f51145 100644 Binary files a/test/image/baselines/uniformtext_pie_8_radial.png and b/test/image/baselines/uniformtext_pie_8_radial.png differ diff --git a/test/image/baselines/uniformtext_pie_8_tangential.png b/test/image/baselines/uniformtext_pie_8_tangential.png index 718ee822355..2b10a5842c0 100644 Binary files a/test/image/baselines/uniformtext_pie_8_tangential.png and b/test/image/baselines/uniformtext_pie_8_tangential.png differ diff --git a/test/image/baselines/uniformtext_pie_inside-text-orientation.png b/test/image/baselines/uniformtext_pie_inside-text-orientation.png index a61ef348ff4..2355f51eaf6 100644 Binary files a/test/image/baselines/uniformtext_pie_inside-text-orientation.png and b/test/image/baselines/uniformtext_pie_inside-text-orientation.png differ diff --git a/test/image/baselines/uniformtext_pie_pull.png b/test/image/baselines/uniformtext_pie_pull.png index 18073572235..71b6b01e261 100644 Binary files a/test/image/baselines/uniformtext_pie_pull.png and b/test/image/baselines/uniformtext_pie_pull.png differ diff --git a/test/image/mocks/bar-like_textangle45.json b/test/image/mocks/bar-like_textangle45.json index 706d473f17c..c9680ff3708 100644 --- a/test/image/mocks/bar-like_textangle45.json +++ b/test/image/mocks/bar-like_textangle45.json @@ -144,7 +144,7 @@ "legend": { "orientation": "h", "title": { - "text": "bar, funnel & waterfall
textangle:-45" + "text": "bar, funnel & waterfall
textangle:-45" } }, "barmode": "stack", diff --git a/test/image/mocks/bar-like_textangle60.json b/test/image/mocks/bar-like_textangle60.json index a8bcab4c7e3..f873343b8b2 100644 --- a/test/image/mocks/bar-like_textangle60.json +++ b/test/image/mocks/bar-like_textangle60.json @@ -144,7 +144,7 @@ "legend": { "orientation": "h", "title": { - "text": "bar, funnel & waterfall
textangle:-60" + "text": "bar, funnel & waterfall
textangle:-60" } }, "barmode": "stack", diff --git a/test/image/mocks/gl3d_mesh3d_coloring.json b/test/image/mocks/gl3d_mesh3d_coloring.json index cae67e7e5c4..d2a365839a8 100644 --- a/test/image/mocks/gl3d_mesh3d_coloring.json +++ b/test/image/mocks/gl3d_mesh3d_coloring.json @@ -103,7 +103,7 @@ "bgcolor": "#eee", "orientation": "h", "title": { - "text": "mesh3d with different coloring:", + "text": "mesh3d with different coloring:", "side": "top left" } }, diff --git a/test/image/mocks/heatmap_legend.json b/test/image/mocks/heatmap_legend.json index 80834953a08..25f99c508be 100644 --- a/test/image/mocks/heatmap_legend.json +++ b/test/image/mocks/heatmap_legend.json @@ -60,7 +60,7 @@ "orientation": "h", "title": { "side": "top left", - "text": "heatmap and contour legends" + "text": "heatmap and contour legends" } }, "height": 800, diff --git a/test/image/mocks/pie_inside-text-orientation.json b/test/image/mocks/pie_inside-text-orientation.json index e34af7b7fbc..8e584380bf7 100644 --- a/test/image/mocks/pie_inside-text-orientation.json +++ b/test/image/mocks/pie_inside-text-orientation.json @@ -361,7 +361,7 @@ }, "legend": { "title": { - "text": "inside text orientation" + "text": "inside text orientation" } }, "font": { diff --git a/test/image/mocks/uniformtext_bar-like_10_auto.json b/test/image/mocks/uniformtext_bar-like_10_auto.json index a6c4b768e31..0b518a851c5 100644 --- a/test/image/mocks/uniformtext_bar-like_10_auto.json +++ b/test/image/mocks/uniformtext_bar-like_10_auto.json @@ -136,7 +136,7 @@ "legend": { "orientation": "h", "title": { - "text": "bar, funnel & waterfall uniform text
with auto orientation
minsize=8" + "text": "bar, funnel & waterfall uniform text
with auto orientation
minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_bar-like_8_horizontal.json b/test/image/mocks/uniformtext_bar-like_8_horizontal.json index aa461527fa2..890b423cb08 100644 --- a/test/image/mocks/uniformtext_bar-like_8_horizontal.json +++ b/test/image/mocks/uniformtext_bar-like_8_horizontal.json @@ -143,7 +143,7 @@ "legend": { "orientation": "h", "title": { - "text": "bar, funnel & waterfall uniform text
with horizontal orientation
minsize=8" + "text": "bar, funnel & waterfall uniform text
with horizontal orientation
minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_bar-like_8_textangle.json b/test/image/mocks/uniformtext_bar-like_8_textangle.json index f46cbf923a5..cd468ff9824 100644 --- a/test/image/mocks/uniformtext_bar-like_8_textangle.json +++ b/test/image/mocks/uniformtext_bar-like_8_textangle.json @@ -143,7 +143,7 @@ "legend": { "orientation": "h", "title": { - "text": "bar, funnel & waterfall uniform text
with vertical orientation
textangle:-90 | minsize=8" + "text": "bar, funnel & waterfall uniform text
with vertical orientation
textangle:-90 | minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_bar-like_8_textangle45.json b/test/image/mocks/uniformtext_bar-like_8_textangle45.json index c2efa3e6858..fb7584c5bb4 100644 --- a/test/image/mocks/uniformtext_bar-like_8_textangle45.json +++ b/test/image/mocks/uniformtext_bar-like_8_textangle45.json @@ -143,7 +143,7 @@ "legend": { "orientation": "h", "title": { - "text": "bar, funnel & waterfall uniform text
textangle:-45 | minsize=8" + "text": "bar, funnel & waterfall uniform text
textangle:-45 | minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_pie_16_auto.json b/test/image/mocks/uniformtext_pie_16_auto.json index 28dceeed95e..9e34fab5bba 100644 --- a/test/image/mocks/uniformtext_pie_16_auto.json +++ b/test/image/mocks/uniformtext_pie_16_auto.json @@ -181,7 +181,7 @@ "legend": { "orientation": "h", "title": { - "text": "pie uniform text
with auto orientation
minsize=16" + "text": "pie uniform text
with auto orientation
minsize=16" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_pie_8_horizontal.json b/test/image/mocks/uniformtext_pie_8_horizontal.json index 20d952a2f30..d06f789b07b 100644 --- a/test/image/mocks/uniformtext_pie_8_horizontal.json +++ b/test/image/mocks/uniformtext_pie_8_horizontal.json @@ -229,7 +229,7 @@ "legend": { "orientation": "h", "title": { - "text": "pie uniform text
with horizontal orientation
minsize=8" + "text": "pie uniform text
with horizontal orientation
minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_pie_8_horizontal_center.json b/test/image/mocks/uniformtext_pie_8_horizontal_center.json index b503a427e0d..2609e9631d2 100644 --- a/test/image/mocks/uniformtext_pie_8_horizontal_center.json +++ b/test/image/mocks/uniformtext_pie_8_horizontal_center.json @@ -189,7 +189,7 @@ "legend": { "orientation": "h", "title": { - "text": "pie uniform text
with horizontal orientation
minsize=8" + "text": "pie uniform text
with horizontal orientation
minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_pie_8_radial.json b/test/image/mocks/uniformtext_pie_8_radial.json index 037c522214e..d9d101dc85f 100644 --- a/test/image/mocks/uniformtext_pie_8_radial.json +++ b/test/image/mocks/uniformtext_pie_8_radial.json @@ -237,7 +237,7 @@ "legend": { "orientation": "h", "title": { - "text": "pie uniform text
with radial orientation
minsize=8" + "text": "pie uniform text
with radial orientation
minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_pie_8_tangential.json b/test/image/mocks/uniformtext_pie_8_tangential.json index 3490e845771..a367d36480b 100644 --- a/test/image/mocks/uniformtext_pie_8_tangential.json +++ b/test/image/mocks/uniformtext_pie_8_tangential.json @@ -237,7 +237,7 @@ "legend": { "orientation": "h", "title": { - "text": "pie uniform text
with tangential orientation
minsize=8" + "text": "pie uniform text
with tangential orientation
minsize=8" } }, "uniformtext": { diff --git a/test/image/mocks/uniformtext_pie_inside-text-orientation.json b/test/image/mocks/uniformtext_pie_inside-text-orientation.json index aa0d8c20b5f..e66401606fb 100644 --- a/test/image/mocks/uniformtext_pie_inside-text-orientation.json +++ b/test/image/mocks/uniformtext_pie_inside-text-orientation.json @@ -361,7 +361,7 @@ }, "legend": { "title": { - "text": "inside text orientation" + "text": "inside text orientation" } }, "font": { diff --git a/test/image/mocks/uniformtext_pie_pull.json b/test/image/mocks/uniformtext_pie_pull.json index 9ed3c6e508a..1c8c70fe9ee 100644 --- a/test/image/mocks/uniformtext_pie_pull.json +++ b/test/image/mocks/uniformtext_pie_pull.json @@ -124,7 +124,7 @@ }, "legend": { "title": { - "text": "pie uniform text
with horizontal orientation
minsize=20" + "text": "pie uniform text
with horizontal orientation
minsize=20" } }, "uniformtext": { diff --git a/test/jasmine/tests/histogram2d_test.js b/test/jasmine/tests/histogram2d_test.js index 630219ad893..fd65a3a1856 100644 --- a/test/jasmine/tests/histogram2d_test.js +++ b/test/jasmine/tests/histogram2d_test.js @@ -18,6 +18,7 @@ describe('Test histogram2d', function() { function supplyDefaults(traceIn, traceOut, defaultColor, layout) { layout._dfltTitle = {colorbar: 'cb'}; + layout.font = {color: '#444'}; return supplyDefaultsRaw(traceIn, traceOut, defaultColor, layout); } diff --git a/test/jasmine/tests/mesh3d_test.js b/test/jasmine/tests/mesh3d_test.js index ee52eb53dbf..46a610a337f 100644 --- a/test/jasmine/tests/mesh3d_test.js +++ b/test/jasmine/tests/mesh3d_test.js @@ -10,7 +10,7 @@ describe('Test mesh3d', function() { describe('supplyDefaults', function() { var defaultColor = '#444'; - var layout = {_dfltTitle: {colorbar: 'cb'}}; + var layout = {_dfltTitle: {colorbar: 'cb'}, font: {color: '#444'}}; var traceIn, traceOut; diff --git a/test/jasmine/tests/surface_test.js b/test/jasmine/tests/surface_test.js index 0db2cd18eab..15a68375b4c 100644 --- a/test/jasmine/tests/surface_test.js +++ b/test/jasmine/tests/surface_test.js @@ -10,7 +10,7 @@ describe('Test surface', function() { describe('supplyDefaults', function() { var defaultColor = '#444'; - var layout = {_dfltTitle: {colorbar: 'cb'}}; + var layout = {_dfltTitle: {colorbar: 'cb'}, font: {color: '#444'}}; var traceIn, traceOut;