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

2021-07-28 17:45:15 +01:00
parent 64e3c72f65 b8781b7552
commit 6123ccb2eb
101 changed files with 2577 additions and 726 deletions
--- a/res/css/structures/_SpaceRoomDirectory.scss
+++ b/res/css/structures/_SpaceRoomDirectory.scss
@@ -191,7 +191,6 @@ limitations under the License.
        position: relative;
        padding: 8px 16px;
        border-radius: 8px;
-        min-height: 56px;
        box-sizing: border-box;

        display: grid;