From c7f030f325ef047a7d63a0a0ddbe35c2de25367f Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 10 Feb 2016 20:04:03 +0500 Subject: Fixing codespan inline issue --- web/react/utils/markdown.jsx | 2 +- web/sass-files/sass/partials/_markdown.scss | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 8b3602a89..17f30a7c5 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -152,7 +152,7 @@ class MattermostMarkdownRenderer extends marked.Renderer { } codespan(text) { - return '
' + super.codespan(text) + '
'; + return '' + super.codespan(text) + ''; } br() { diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index a08379ae1..339d9f45f 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -54,11 +54,9 @@ code { white-space: pre; } - pre { - &.text-nowrap { - code { - white-space: nowrap; - } + .codespan__pre-wrap { + code { + white-space: pre-wrap; } } } -- cgit v1.2.3-1-g7c22