diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/utils/markdown.jsx | 18 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 8 |
2 files changed, 24 insertions, 2 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 347024e1a..7e88f8644 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -15,6 +15,14 @@ export class MattermostMarkdownRenderer extends marked.Renderer { this.formattingOptions = formattingOptions; } + br() { + if (this.formattingOptions.singleline) { + return ' '; + } + + return super.br(); + } + heading(text, level, raw) { const id = `${this.options.headerPrefix}${raw.toLowerCase().replace(/[^\w]+/g, '-')}`; return `<h${level} id="${id}" class="markdown__heading">${text}</h${level}>`; @@ -31,11 +39,19 @@ export class MattermostMarkdownRenderer extends marked.Renderer { if (title) { output += ' title="' + title + '"'; } - output += '>' + text + '</a>'; + output += ' target="_blank">' + text + '</a>'; return output; } + paragraph(text) { + if (this.formattingOptions.singleline) { + return `<p class="markdown__paragraph-inline">${text}</p>`; + } + + return super.paragraph(text); + } + table(header, body) { return `<table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table>`; } diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index c09e9d7b4..bccea6e0e 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -1,6 +1,12 @@ .markdown__heading { font-weight: bold; } +.markdown__paragraph-inline { + display: inline; + + .markdown__paragraph-inline { + margin-left: 4px; + } +} .markdown__table { background: #fff; margin: 5px 0 10px; @@ -25,4 +31,4 @@ pre { code { color: #c7254e; } -}
\ No newline at end of file +} |