Merge remote-tracking branch 'upstream/develop' into task/colors-2

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
parent c34dedb57b 52e1884bbd
commit b6ea75b681
96 changed files with 2815 additions and 1833 deletions
@@ -36,6 +36,10 @@ $timelineImageBorderRadius: 4px;
        animation: mx--anim-pulse 1.75s infinite cubic-bezier(.4, 0, .6, 1);
        border-radius: $timelineImageBorderRadius;
    }
+
+    .mx_no-image-placeholder {
+        background-color: $primary-bg-color;
+    }
 }

 .mx_MImageBody_thumbnail_container {