Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer

Conflicts: res/css/views/rooms/_AppsDrawer.scss
2020-08-20 10:26:35 +01:00
parent 735826015d 0690c02e0c
commit ae65ed5c2e
1200 changed files with 50387 additions and 28789 deletions
@@ -49,7 +49,7 @@ $MiniAppTileHeight: 114px;
    order: 2;
    cursor: pointer;
    padding: 0;
-    margin: 5px auto 5px 0px;
+    margin: 5px auto 5px 0;
    color: $accent-color;
    font-size: $font-12px;
 }
@@ -87,7 +87,7 @@ $MiniAppTileHeight: 114px;
    margin: 0;
    padding: 0;
    border: 5px solid $widget-menu-bar-bg-color;
-    border-radius: 4px;
+    border-radius: 8px;
    display: flex;
    flex-direction: column;
 }
@@ -117,6 +117,7 @@ $MiniAppTileHeight: 114px;
 .mx_AppTile_persistedWrapper div {
    width: 100%;
    height: 100%;
+    min-width: 300px;
 }

 .mx_AppTileMenuBar {