Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage

Conflicts: src/components/views/elements/AccessibleTooltipButton.tsx
2020-07-16 15:47:12 +01:00
parent ebb9c4e814 9b13ef1446
commit a704eefdd5
22 changed files with 259 additions and 110 deletions
@@ -97,7 +97,7 @@ $irc-line-height: $font-18px;
        }

        > .mx_EventTile_e2eIcon {
-            position: relative;
+            position: absolute;
            right: unset;
            left: unset;
            top: 0;