Merge branch 'develop' into rav/update_status_bar

src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css

@@ -116,6 +116,13 @@ limitations under the License.
     -webkit-flex: 1;
     flex: 1;
 
+    /* Experimental fix for https://github.com/vector-im/vector-web/issues/947
+       and https://github.com/vector-im/vector-web/issues/946.
+       Empirically this stops the MessagePanel's width exploding outwards when
+       gemini is in 'prevented' mode
+       */
+    overflow-x: auto;
+
     /* XXX: Hack: apparently if you try to nest a flex-box
      * within a non-flex-box within a flex-box, the height
      * of the innermost element gets miscalculated if the

src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css

@@ -170,6 +170,10 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_UserSettings_avatarPicker_img .mx_BaseAvatar_image {
+    object-fit: cover;
+}
+
 .mx_UserSettings_avatarPicker_edit {
     text-align: center;
     margin-top: 10px;