Merge remote-tracking branch 'origin/develop' into develop

2018-06-14 09:58:05 +00:00
parent b9f69d6893 742a2d0111
commit f8ca3674ac
2 changed files with 1 additions and 5 deletions
--- a/res/css/views/messages/_MTextBody.scss
+++ b/res/css/views/messages/_MTextBody.scss
@@ -17,8 +17,3 @@ limitations under the License.
 .mx_MTextBody {
    white-space: pre-wrap;
 }
-
-.mx_MTextBody pre{
-  overflow-y: auto;
-  max-height: 30vh;
-}
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -391,6 +391,7 @@ limitations under the License.
 .mx_EventTile_content .markdown-body pre {
    overflow-x: overlay;
    overflow-y: visible;
+    max-height: 30vh;
 }

 .mx_EventTile_content .markdown-body code {