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

Conflicts: src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
parent b89434fcbc 405fe436a6
commit 2114e854f9
131 changed files with 929 additions and 505 deletions
@@ -36,6 +36,10 @@ limitations under the License.
        flex-shrink: 0;
        overflow-y: auto;

+        .mx_EventTile[data-layout=bubble] {
+            margin-top: 20px;
+        }
+
        div {
            pointer-events: none;
        }