diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-09 14:12:10 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-09 14:12:10 -0500 |
| commit | c88447b6d4c2acc99286d6db0badf95aee5a31d9 (patch) | |
| tree | b5a4524354e742f13c53863b726fa02a8a099fe0 /web | |
| parent | 81b26698664572adceacd93b4ff816ef2cc907e0 (diff) | |
| parent | 24943aba59b8cfe225d768a6e394bb49347c5005 (diff) | |
| download | chat-c88447b6d4c2acc99286d6db0badf95aee5a31d9.tar.gz chat-c88447b6d4c2acc99286d6db0badf95aee5a31d9.tar.bz2 chat-c88447b6d4c2acc99286d6db0badf95aee5a31d9.zip | |
Merge pull request #2117 from asaadmahmoodspin/ui-improvements
Fixing single line code block on firefox
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/utils/markdown.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 47b3a9a66..8b3602a89 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -151,6 +151,10 @@ class MattermostMarkdownRenderer extends marked.Renderer { ); } + codespan(text) { + return '<pre class="text-nowrap">' + super.codespan(text) + '</pre>'; + } + br() { if (this.formattingOptions.singleline) { return ' '; diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index 0ba1929e0..a08379ae1 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -54,6 +54,13 @@ code { white-space: pre; } + pre { + &.text-nowrap { + code { + white-space: nowrap; + } + } + } } .markdown__table { background: #fff; |