Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters

res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss

@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_CreateKeyBackupDialog {
-    padding-right: 40px;
-}
-
 .mx_CreateKeyBackupDialog .mx_Dialog_title {
     /* TODO: Consider setting this for all dialog titles. */
     margin-bottom: 1em;

res/css/views/dialogs/keybackup/_NewRecoveryMethodDialog.scss

@@ -24,7 +24,7 @@ limitations under the License.
     padding-bottom: 10px;
 
     &:before {
-        mask: url("../../../img/e2e/lock-warning.svg");
+        mask: url("../../img/e2e/lock-warning.svg");
         mask-repeat: no-repeat;
         background-color: $primary-fg-color;
         content: "";

res/css/views/elements/_RichText.scss

@@ -19,6 +19,11 @@
     cursor: pointer;
 }
 
+/* More specific to override `.markdown-body a` text-decoration */
+.mx_EventTile_content .markdown-body a.mx_Pill {
+    text-decoration: none;
+}
+
 /* More specific to override `.markdown-body a` color */
 .mx_EventTile_content .markdown-body a.mx_UserPill,
 .mx_UserPill {
@@ -31,7 +36,9 @@
     background-color: $accent-color ! important;
 }
 
+/* More specific to override `.markdown-body a` color */
 .mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me,
+.mx_EventTile_content .markdown-body a.mx_AtRoomPill,
 .mx_EventTile_content .mx_AtRoomPill,
 .mx_MessageComposer_input .mx_AtRoomPill {
     color: $accent-fg-color;

res/css/views/messages/_MImageBody.scss

@@ -56,4 +56,6 @@ limitations under the License.
     border-radius: 5px;
     background: $imagebody-giflabel;
     border: 2px solid $imagebody-giflabel-border;
+    color: $imagebody-giflabel-color;
+    pointer-events: none;
 }

res/css/views/rooms/_MemberList.scss

@@ -53,6 +53,10 @@ limitations under the License.
 .mx_MemberList_query,
 .mx_GroupMemberList_query,
 .mx_GroupRoomList_query {
+    flex: 0 0 auto;
+}
+
+.mx_MemberList .gm-scrollbar-container {
     flex: 1 1 0;
 }
 

res/css/views/rooms/_RoomTile.scss

@@ -54,12 +54,14 @@ limitations under the License.
     align-items: center;
     flex: 1;
     vertical-align: middle;
+    min-width: 0;
 }
 
 .mx_RoomTile_labelContainer {
     display: flex;
     flex-direction: column;
     flex: 1;
+    min-width: 0;
 }
 
 .mx_RoomTile_subtext {
@@ -99,7 +101,6 @@ limitations under the License.
 }
 
 .mx_RoomTile_name {
-    flex: 1 5 auto;
     font-size: 14px;
     font-weight: 600;
     padding: 0 6px;