From cfdc880d8c126db3f43f4b386a9670f86a73b20b Mon Sep 17 00:00:00 2001 From: Maurits Lourens Date: Tue, 5 Dec 2017 12:51:16 +0100 Subject: [PATCH] fixed incorrect fontFamily for multiple fonts --- browser/components/MarkdownPreview.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 95839ad6..a3e7bb93 100644 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -49,12 +49,12 @@ body { font-size: ${fontSize}px; } code { - font-family: ${codeBlockFontFamily.join(', ')}; + font-family: '${codeBlockFontFamily.join("','")}'; background-color: rgba(0,0,0,0.04); } .lineNumber { ${lineNumber && 'display: block !important;'} - font-family: ${codeBlockFontFamily.join(', ')}; + font-family: '${codeBlockFontFamily.join("','")}'; } .clipboardButton { @@ -255,10 +255,10 @@ export default class MarkdownPreview extends React.Component { const { fontSize, lineNumber, codeBlockTheme } = this.props let { fontFamily, codeBlockFontFamily } = this.props fontFamily = _.isString(fontFamily) && fontFamily.trim().length > 0 - ? [fontFamily].concat(defaultFontFamily) + ? fontFamily.split(',').map(fontName => fontName.trim()).concat(defaultFontFamily) : defaultFontFamily codeBlockFontFamily = _.isString(codeBlockFontFamily) && codeBlockFontFamily.trim().length > 0 - ? [codeBlockFontFamily].concat(defaultCodeBlockFontFamily) + ? codeBlockFontFamily.split(',').map(fontName => fontName.trim()).concat(defaultCodeBlockFontFamily) : defaultCodeBlockFontFamily this.setCodeTheme(codeBlockTheme)