summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2016-02-10 20:04:03 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2016-02-10 20:04:03 +0500
commitc7f030f325ef047a7d63a0a0ddbe35c2de25367f (patch)
tree0b120b4c33e784693318e5bfbd84221365f8ca34
parent6225522478f61aa134d167954d3116c72a6148c3 (diff)
downloadchat-c7f030f325ef047a7d63a0a0ddbe35c2de25367f.tar.gz
chat-c7f030f325ef047a7d63a0a0ddbe35c2de25367f.tar.bz2
chat-c7f030f325ef047a7d63a0a0ddbe35c2de25367f.zip
Fixing codespan inline issue
-rw-r--r--web/react/utils/markdown.jsx2
-rw-r--r--web/sass-files/sass/partials/_markdown.scss8
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;
}
}
}