Merge branch 'develop' into t3chguy/fix/6606

2021-06-03 19:33:09 +01:00
parent 4f50727010 7421efe8f9
commit 93010d34fd
24 changed files with 317 additions and 228 deletions
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -222,7 +222,6 @@ limitations under the License.

 .mx_RoomView_MessageList li {
    clear: both;
-    contain: content;
 }

 li.mx_RoomView_myReadMarker_container {
@@ -239,6 +238,7 @@ hr.mx_RoomView_myReadMarker {
    position: relative;
    top: -1px;
    z-index: 1;
+    will-change: width;
    transition: width 400ms easeinsine 1s, opacity 400ms easeinsine 1s;
    width: 99%;
    opacity: 1;