Issue #616 - Fixed multiline code block overflow

client/stylesheets/base.less

@@ -57,6 +57,10 @@ code {
 	}
 }
 
+code.hljs {
+	overflow-y: hidden;
+}
+
 pre {
 	display: inline-block;
 	width: 100%;
@@ -3978,11 +3982,3 @@ a.github-fork {
 		margin-bottom: 10px;
 	}
 }
-
-.hljs2 {
-	display: block;
-	padding: 0.5em;
-	color: #333;
-	background: #f8f8f8;
-	-webkit-text-size-adjust: none;
-}

packages/rocketchat-highlight/highlight.coffee

@@ -40,7 +40,7 @@ class Highlight
 							result = hljs.highlightAuto code
 						else
 							result = hljs.highlight lang, code
-						msgParts[index] = "<pre><code class='hljs2 " + result.language + "'><span class='copyonly'>```<br></span>" + result.value + "<span class='copyonly'><br>```</span></code></pre>"
+						msgParts[index] = "<pre><code class='hljs " + result.language + "'><span class='copyonly'>```<br></span>" + result.value + "<span class='copyonly'><br>```</span></code></pre>"
 					else
 						msgParts[index] = part