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

2021-02-28 11:25:57 +05:30
parent 70a67e8e6e 9722091b80
commit 517a27eaba
102 changed files with 3488 additions and 1555 deletions
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -128,7 +128,7 @@ limitations under the License.
 }

 .mx_UserMenu_contextMenu {
-    width: 247px;
+    width: 258px;

    // These override the styles already present on the user menu rather than try to
    // define a new menu. They are specifically for the stacked menu when a community