[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

res/css/views/rooms/_E2EIcon.scss

@@ -22,7 +22,9 @@ limitations under the License.
     display: block;
 }
 
-.mx_E2EIcon_verified::after, .mx_E2EIcon_warning::after {
+.mx_E2EIcon_warning::after,
+.mx_E2EIcon_normal::after,
+.mx_E2EIcon_verified::after {
     content: "";
     display: block;
     position: absolute;
@@ -34,10 +36,14 @@ limitations under the License.
     background-size: contain;
 }
 
-.mx_E2EIcon_verified::after {
-    background-image: url('$(res)/img/e2e/verified.svg');
-}
-
 .mx_E2EIcon_warning::after {
     background-image: url('$(res)/img/e2e/warning.svg');
 }
+
+.mx_E2EIcon_normal::after {
+    background-image: url('$(res)/img/e2e/normal.svg');
+}
+
+.mx_E2EIcon_verified::after {
+    background-image: url('$(res)/img/e2e/verified.svg');
+}

res/css/views/rooms/_EventTile.scss

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -353,7 +354,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     left: 46px;
     width: 15px;
     height: 15px;
-    cursor: pointer;
     display: block;
     bottom: 0;
     right: 0;

res/css/views/rooms/_LinkPreviewWidget.scss

@@ -52,12 +52,18 @@ limitations under the License.
 }
 
 .mx_LinkPreviewWidget_cancel {
-    visibility: hidden;
     cursor: pointer;
-    flex: 0 0 40px;
+    width: 18px;
+    height: 18px;
+
+    img {
+        flex: 0 0 40px;
+        visibility: hidden;
+    }
 }
 
-.mx_LinkPreviewWidget:hover .mx_LinkPreviewWidget_cancel {
+.mx_LinkPreviewWidget:hover .mx_LinkPreviewWidget_cancel img,
+.mx_LinkPreviewWidget_cancel.focus-visible:focus img {
     visibility: visible;
 }
 

res/css/views/rooms/_RoomRecoveryReminder.scss

@@ -40,4 +40,5 @@ limitations under the License.
 
 .mx_RoomRecoveryReminder_secondary {
     font-size: 90%;
+    margin-top: 1em;
 }

res/css/views/rooms/_RoomTile.scss

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

res/css/views/rooms/_UserOnlineDot.scss

@@ -0,0 +1,23 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_UserOnlineDot {
+    border-radius: 50%;
+    background-color: $accent-color;
+    height: 5px;
+    width: 5px;
+    display: inline-block;
+}