@@ -81,10 +81,6 @@ function dimensionsDefaults(traceIn, traceOut) {
8181 return dimensionsOut ;
8282}
8383
84- function coerceFont ( fontAttr , coerce , layoutFont , defaultFont ) {
85- Lib . coerceFont ( coerce , fontAttr , Lib . extendFlat ( { } , layoutFont , defaultFont , fontAttr ) ) ;
86- }
87-
8884module . exports = function supplyDefaults ( traceIn , traceOut , defaultColor , layout ) {
8985 function coerce ( attr , dflt ) {
9086 return Lib . coerce ( traceIn , traceOut , attributes , attr , dflt ) ;
@@ -101,7 +97,15 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
10197 traceOut . visible = false ;
10298 }
10399
104- coerceFont ( 'labelfont' , coerce , layout . font , attributes . labelfont . dflt || { } ) ;
105- coerceFont ( 'tickfont' , coerce , layout . font , attributes . tickfont . dflt || { } ) ;
106- coerceFont ( 'rangefont' , coerce , layout . font , attributes . rangefont . dflt || { } ) ;
100+ // make default font size 10px,
101+ // scale linearly with global font size
102+ var fontDflt = {
103+ family : layout . font . family ,
104+ size : Math . round ( layout . font . size * ( 10 / 12 ) ) ,
105+ color : layout . font . color
106+ } ;
107+
108+ Lib . coerceFont ( coerce , 'labelfont' , fontDflt ) ;
109+ Lib . coerceFont ( coerce , 'tickfont' , fontDflt ) ;
110+ Lib . coerceFont ( coerce , 'rangefont' , fontDflt ) ;
107111} ;
0 commit comments