public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

fixed incorrect fontFamily for multiple fonts

Browse Source
This commit is contained in:
Maurits Lourens
2017-12-05 12:51:16 +01:00
parent 7303e8bdd2
commit cfdc880d8c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/MarkdownPreview.js
View File

@@ -49,12 +49,12 @@ body {
font-size: ${fontSize}px; font-size: ${fontSize}px;
} }
code { code {
font-family: ${codeBlockFontFamily.join(', ')}; font-family: '${codeBlockFontFamily.join("','")}';
background-color: rgba(0,0,0,0.04); background-color: rgba(0,0,0,0.04);
} }
.lineNumber { .lineNumber {
${lineNumber && 'display: block !important;'} ${lineNumber && 'display: block !important;'}
font-family: ${codeBlockFontFamily.join(', ')}; font-family: '${codeBlockFontFamily.join("','")}';
} }
.clipboardButton { .clipboardButton {
@@ -255,10 +255,10 @@ export default class MarkdownPreview extends React.Component {
const { fontSize, lineNumber, codeBlockTheme } = this.props const { fontSize, lineNumber, codeBlockTheme } = this.props
let { fontFamily, codeBlockFontFamily } = this.props let { fontFamily, codeBlockFontFamily } = this.props
fontFamily = _.isString(fontFamily) && fontFamily.trim().length > 0 fontFamily = _.isString(fontFamily) && fontFamily.trim().length > 0
? [fontFamily].concat(defaultFontFamily) ? fontFamily.split(',').map(fontName => fontName.trim()).concat(defaultFontFamily)
: defaultFontFamily : defaultFontFamily
codeBlockFontFamily = _.isString(codeBlockFontFamily) && codeBlockFontFamily.trim().length > 0 codeBlockFontFamily = _.isString(codeBlockFontFamily) && codeBlockFontFamily.trim().length > 0
? [codeBlockFontFamily].concat(defaultCodeBlockFontFamily) ? codeBlockFontFamily.split(',').map(fontName => fontName.trim()).concat(defaultCodeBlockFontFamily)
: defaultCodeBlockFontFamily : defaultCodeBlockFontFamily
this.setCodeTheme(codeBlockTheme) this.setCodeTheme(codeBlockTheme)