Merge pull request #674 from rodrigogs/master

Issue #616 - Fixed multiline code block overflow
RocketChat · Sep 3, 2015 · eed855d · eed855d
2 parents 9c74e23 + 14e78ec
commit eed855d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
@@ -44,11 +44,11 @@ code {
 	font-size: 13px;
 	font-weight: bold;
 	margin: 5px 0;
-	overflow-x: auto;
 	padding: 0.5em;
 	vertical-align: middle;
 	word-wrap: break-word;
 	text-align: left;
+	white-space: pre-wrap;
 	&.inline {
 		display: inline-block;
 		padding: 0 5px;
@@ -57,6 +57,10 @@ code {
 	}
 }
 
+code.hljs {
+	overflow-y: hidden;
+}
+
 pre {
 	display: inline-block;
 	width: 100%;
@@ -1903,7 +1907,7 @@ a.github-fork {
 .page-settings {
 	.rocket-form {
 		max-width: none;
-		width: 100%; 
+		width: 100%;
 		padding: 0;
 	}
 }