Merge pull request #2135 from asaadmahmoodspin/release-2.0

PLT-1935 - Fixing codespan inline issue

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() {

web/sass-files/sass/partials/_markdown.scss

@@ -54,11 +54,9 @@
 	code {
 		white-space: pre;
 	}
-	pre {
+	.codespan__pre-wrap {
-		&.text-nowrap {
+		code {
-			code {
+			white-space: pre-wrap;
-				white-space: nowrap;
-			}
 		}
 	}
 }