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

pull/21833/head
Weblate 2018-06-14 09:58:05 +00:00
commit f8ca3674ac
2 changed files with 1 additions and 5 deletions
res/css/views

View File

@ -17,8 +17,3 @@ limitations under the License.
.mx_MTextBody {
white-space: pre-wrap;
}
.mx_MTextBody pre{
overflow-y: auto;
max-height: 30vh;
}

View File

@ -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 {