Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

2020-05-07 18:01:20 +01:00
parent bab7d5f461 2aa7a6087c
commit 33a5b5142d
62 changed files with 2367 additions and 728 deletions
@@ -91,9 +91,8 @@ limitations under the License.
        }

        .mx_Toast_description {
-            max-width: 400px;
+            max-width: 272px;
            overflow: hidden;
-            white-space: nowrap;
            text-overflow: ellipsis;
            margin: 4px 0 11px 0;
            font-size: $font-12px;