summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2016-02-09 23:46:29 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2016-02-09 23:46:29 +0500
commit24943aba59b8cfe225d768a6e394bb49347c5005 (patch)
tree0755e2d6669ea0d7c1da323369ab4a26a00653f5
parentdc186240d559a230445d3193e7468d30721ad10c (diff)
downloadchat-24943aba59b8cfe225d768a6e394bb49347c5005.tar.gz
chat-24943aba59b8cfe225d768a6e394bb49347c5005.tar.bz2
chat-24943aba59b8cfe225d768a6e394bb49347c5005.zip
Fixing single line code block on firefox
-rw-r--r--web/react/utils/markdown.jsx4
-rw-r--r--web/sass-files/sass/partials/_markdown.scss7
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;