Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096

Conflicts: src/components/structures/SpaceRoomView.tsx src/components/views/dialogs/BetaFeedbackDialog.tsx
2021-07-23 18:28:21 +01:00
parent dec2c48155 869a5fb5c7
commit 1ba601ba22
114 changed files with 794 additions and 445 deletions
@@ -16,10 +16,6 @@ limitations under the License.

 $timelineImageBorderRadius: 4px;

-.mx_MImageBody {
-    display: block;
-}
-
 .mx_MImageBody_thumbnail {
    object-fit: contain;
    border-radius: $timelineImageBorderRadius;
@@ -28,7 +24,7 @@ $timelineImageBorderRadius: 4px;
    justify-content: center;
    align-items: center;

-    > canvas {
+    > div > canvas {
        border-radius: $timelineImageBorderRadius;
    }
 }