upstream changes

This commit is contained in:
Darko Luketic 2021-11-29 00:26:49 +01:00
parent 692f324074
commit 665970e71a

View File

@ -115,8 +115,8 @@ class CrayonFormatter {
$_line_height = $hl->setting_val(CrayonSettings::LINE_HEIGHT); $_line_height = $hl->setting_val(CrayonSettings::LINE_HEIGHT);
// Don't allow line height to be less than font size // Don't allow line height to be less than font size
$line_height = ($_line_height > $_font_size ? $_line_height : $_font_size) . 'px !important;'; $line_height = ($_line_height > $_font_size ? $_line_height : $_font_size) . 'px !important;';
$toolbar_height = $_font_size * 1.5 . 'px !important;'; $toolbar_height = floatval($_font_size) * 1.5 . 'px !important;';
$info_height = $_font_size * 1.4 . 'px !important;'; $info_height = floatval($_font_size) * 1.4 . 'px !important;';
$font_style .= "font-size: $_font_size line-height: $line_height"; $font_style .= "font-size: $_font_size line-height: $line_height";
$toolbar_style .= "font-size: $_font_size"; $toolbar_style .= "font-size: $_font_size";