Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases

2020-06-02 18:53:54 +01:00
parent 0046e204a0 b50046f1ab
commit b83ecb1781
102 changed files with 2240 additions and 1410 deletions
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -41,10 +41,6 @@ limitations under the License.
    height: 40px;
 }

-.mx_MatrixChat_toolbarShowing {
-    height: auto;
-}
-
 .mx_MatrixChat {
    width: 100%;
    height: 100%;
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -63,6 +63,10 @@ limitations under the License.
    padding-left: 32px;
    padding-top: 8px;
    position: relative;
+
+    a {
+        display: flex;
+    }
 }

 .mx_NotificationPanel .mx_EventTile_roomName a,