diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-10 11:10:28 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-10 11:10:28 -0500 |
| commit | a15f8c582dd5c9371cce20e572d0552970afbadd (patch) | |
| tree | ed3b7bf46c9a0965ead522381a9d34f06ca65545 | |
| parent | 7410dfb93198f2d74aebf5efea83a16f4561df42 (diff) | |
| parent | c7f030f325ef047a7d63a0a0ddbe35c2de25367f (diff) | |
| download | chat-a15f8c582dd5c9371cce20e572d0552970afbadd.tar.gz chat-a15f8c582dd5c9371cce20e572d0552970afbadd.tar.bz2 chat-a15f8c582dd5c9371cce20e572d0552970afbadd.zip | |
Merge pull request #2135 from asaadmahmoodspin/release-2.0
PLT-1935 - Fixing codespan inline issue
| -rw-r--r-- | web/react/utils/markdown.jsx | 2 | ||||
| -rw-r--r-- | 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 '<pre class="text-nowrap">' + super.codespan(text) + '</pre>'; + return '<span class="codespan__pre-wrap">' + super.codespan(text) + '</span>'; } 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; } } } |